Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: nss/mozilla/security/nss/lib/pki/tdcache.c

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: nss/mozilla/security/nss/lib/pki/tdcache.c
===================================================================
--- nss/mozilla/security/nss/lib/pki/tdcache.c (revision 142244)
+++ nss/mozilla/security/nss/lib/pki/tdcache.c (working copy)
@@ -35,7 +35,7 @@
* ***** END LICENSE BLOCK ***** */
#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: tdcache.c,v $ $Revision: 1.49 $ $Date: 2010/02/10 02:04:32 $";
+static const char CVS_ID[] = "@(#) $RCSfile: tdcache.c,v $ $Revision: 1.49.6.1 $ $Date: 2012/05/17 21:40:54 $";
#endif /* DEBUG */
#ifndef PKIM_H
@@ -771,6 +771,7 @@
log_cert_ref("attempted to add cert already in cache", cert);
#endif
PZ_Unlock(td->cache->lock);
+ nss_ZFreeIf(certNickname);
/* collision - somebody else already added the cert
* to the cache before this thread got around to it.
*/
@@ -839,8 +840,11 @@
}
rvCert = cert;
PZ_Unlock(td->cache->lock);
+ nss_ZFreeIf(certNickname);
return rvCert;
loser:
+ nss_ZFreeIf(certNickname);
+ certNickname = NULL;
/* Remove any handles that have been created */
subjectList = NULL;
if (added >= 1) {

Powered by Google App Engine
This is Rietveld 408576698