Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/dev/devutil.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 17 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.33 $ $Date: 2008/11/19 20:44:35 $";
+static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.35 $ $Date: 2010/04/11 05:57:47 $";
 #endif /* DEBUG */
 
 #ifndef DEVM_H
 #include "devm.h"
 #endif /* DEVM_H */
 
 #ifndef CKHELPER_H
 #include "ckhelper.h"
 #endif /* CKHELPER_H */
 
@@ skipping 208 matching lines @@
     rvCache->lock = PZ_NewLock(nssILockOther); /* XXX */
     if (!rvCache->lock) {
         goto loser;
     }
     rvCache->doObjectType[cachedCerts] = cacheCerts;
     rvCache->doObjectType[cachedTrust] = cacheTrust;
     rvCache->doObjectType[cachedCRLs] = cacheCRLs;
     rvCache->token = token; /* cache goes away with token */
     return rvCache;
 loser:
+    nssTokenObjectCache_Destroy(rvCache);
     return (nssTokenObjectCache *)NULL;
 }
 
 static void
 clear_cache (
   nssTokenObjectCache *cache
 )
 {
     nssCryptokiObjectAndAttributes **oa;
     PRUint32 objectType;
@@ skipping 25 matching lines @@
     }
 }
 
 NSS_IMPLEMENT void
 nssTokenObjectCache_Destroy (
   nssTokenObjectCache *cache
 )
 {
     if (cache) {
         clear_cache(cache);
-        PZ_DestroyLock(cache->lock);
+        if (cache->lock) {
+            PZ_DestroyLock(cache->lock);
+        }
         nss_ZFreeIf(cache);
     }
 }
 
 NSS_IMPLEMENT PRBool
 nssTokenObjectCache_HaveObjectClass (
   nssTokenObjectCache *cache,
   CK_OBJECT_CLASS objclass
 )
 {
@@ skipping 406 matching lines @@
         for (oi=0; oi<(PRIntn)numMatches; oi++) {
             objects[oi] = nssCryptokiObject_Clone(matches[oi]->object);
             if (!objects[oi]) {
                 goto loser;
             }
         }
     }
     nssArena_Destroy(arena);
     return objects;
 loser:
-    if (objects) {
-        for (--oi; oi>=0; --oi) {
-            nssCryptokiObject_Destroy(objects[oi]);
-        }
-    }
+    nssCryptokiObjectArray_Destroy(objects);
     nssArena_Destroy(arena);
     return (nssCryptokiObject **)NULL;
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
 nssTokenObjectCache_FindObjectsByTemplate (
   nssTokenObjectCache *cache,
   CK_OBJECT_CLASS objclass,
   CK_ATTRIBUTE_PTR otemplate,
   CK_ULONG otlen,
@@ skipping 280 matching lines @@
     NSSAlgorithmAndParameters *rvAP = NULL;
     rvAP = nss_ZNEW(arenaOpt, NSSAlgorithmAndParameters);
     if (rvAP) {
         rvAP->mechanism.mechanism = CKM_MD5;
         rvAP->mechanism.pParameter = NULL;
         rvAP->mechanism.ulParameterLen = 0;
     }
     return rvAP;
 }