From 065247b5b70fe06b7368ef2a548afa83d32f2bdf Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Mon, 11 Aug 2014 14:32:13 +0000 Subject: [PATCH] Rebase webrtc/base with r6863 version of talk/base: cls integrated: r6809 svn diff -r 6808:6809 http://webrtc.googlecode.com/svn/trunk/talk/base > 6809.diff patch -p0 -i 6809.diff BUG=3379 TBR=solenberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18089004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6864 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/fakesslidentity.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webrtc/base/fakesslidentity.h b/webrtc/base/fakesslidentity.h index 717cb6c3b..71a42d545 100644 --- a/webrtc/base/fakesslidentity.h +++ b/webrtc/base/fakesslidentity.h @@ -65,6 +65,7 @@ class FakeSSLCertificate : public rtc::SSLCertificate { std::vector new_certs(certs_.size()); std::transform(certs_.begin(), certs_.end(), new_certs.begin(), DupCert); *chain = new SSLCertChain(new_certs); + std::for_each(new_certs.begin(), new_certs.end(), DeleteCert); return true; } @@ -72,6 +73,7 @@ class FakeSSLCertificate : public rtc::SSLCertificate { static FakeSSLCertificate* DupCert(FakeSSLCertificate cert) { return cert.GetReference(); } + static void DeleteCert(SSLCertificate* cert) { delete cert; } std::string data_; std::vector certs_; std::string digest_algorithm_;