From 4718219a29746af2e86b0bf211c84bd91823bbe8 Mon Sep 17 00:00:00 2001
From: "alexei.volkov.bugs%sun.com"
 <alexei.volkov.bugs%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 9 Oct 2006 22:25:36 +0000
Subject: [PATCH] 353777: Klocwork Null ptr dereferences in pk11obj.c. r=nelson

git-svn-id: svn://10.0.0.236/trunk@213366 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/pk11wrap/pk11obj.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/security/nss/lib/pk11wrap/pk11obj.c b/mozilla/security/nss/lib/pk11wrap/pk11obj.c
index 1bc9e8443f7..1e4acf43b9b 100644
--- a/mozilla/security/nss/lib/pk11wrap/pk11obj.c
+++ b/mozilla/security/nss/lib/pk11wrap/pk11obj.c
@@ -1187,7 +1187,9 @@ PK11_FindGenericObjects(PK11SlotInfo *slot, CK_OBJECT_CLASS objClass)
     for (i=0; i < count; i++) {
 	obj = PORT_New(PK11GenericObject);
 	if ( !obj ) {
-	    PK11_DestroyGenericObjects(firstObj);
+	    if (firstObj) {
+		PK11_DestroyGenericObjects(firstObj);
+	    }
 	    PORT_Free(objectIDs);
 	    return NULL;
 	}
@@ -1289,7 +1291,7 @@ SECStatus
 PK11_DestroyGenericObjects(PK11GenericObject *objects)
 {
     PK11GenericObject *nextObject;
-    PK11GenericObject *prevObject = objects->prev;
+    PK11GenericObject *prevObject;
  
     if (objects == NULL) {
 	return SECSuccess;