summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 23:33:02 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 23:33:02 +0000
commit8a90f31e70d6c22361e55215bbe217013a20d178 (patch)
tree8f2ca9b0e7076cbaa05ef14fe3da000f8f0e68c9
parenta484e4e3177cfeffe1d487785b85a4902ff75893 (diff)
downloadchromium_src-8a90f31e70d6c22361e55215bbe217013a20d178.zip
chromium_src-8a90f31e70d6c22361e55215bbe217013a20d178.tar.gz
chromium_src-8a90f31e70d6c22361e55215bbe217013a20d178.tar.bz2
Merge 233879 "Stop leaking a CERTCertificate* during SSL renegot..."
> Stop leaking a CERTCertificate* during SSL renegotiation > > BUG=316407 > R=agl > > Review URL: https://codereview.chromium.org/65853002 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/61743019 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@234954 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bfd0d0e..0de7cfb 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1290,7 +1290,7 @@ SECStatus SSLClientSocketNSS::Core::OwnAuthCertHandler(
} else {
// Disallow the server certificate to change in a renegotiation.
CERTCertificate* old_cert = core->nss_handshake_state_.server_cert_chain[0];
- CERTCertificate* new_cert = SSL_PeerCertificate(socket);
+ ScopedCERTCertificate new_cert(SSL_PeerCertificate(socket));
if (new_cert->derCert.len != old_cert->derCert.len ||
memcmp(new_cert->derCert.data, old_cert->derCert.data,
new_cert->derCert.len) != 0) {