Merge 233879 "Stop leaking a CERTCertificate* during SSL renegot..."

net/socket/ssl_client_socket_nss.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 1272 matching lines @@
                                             &negotiated_extension);
     }
     if (rv != SECSuccess || !negotiated_extension) {
       // If the server doesn't support NPN or ALPN, then we don't do False
       // Start with it.
       SSL_OptionSet(socket, SSL_ENABLE_FALSE_START, PR_FALSE);
     }
   } 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) {
       // NSS doesn't have an error code that indicates the server certificate
       // changed. Borrow SSL_ERROR_WRONG_CERTIFICATE (which NSS isn't using)
       // for this purpose.
       PORT_SetError(SSL_ERROR_WRONG_CERTIFICATE);
       return SECFailure;
     }
   }
@@ skipping 2200 matching lines @@
   EnsureThreadIdAssigned();
   base::AutoLock auto_lock(lock_);
   return valid_thread_id_ == base::PlatformThread::CurrentId();
 }
 
 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
   return server_bound_cert_service_;
 }
 
 }  // namespace net