397832 - libpkix leaks memory if a macro calls a function that returns an error. r=nelson

security/nss/lib/certhigh/certvfypkix.c

@@ -1200,7 +1200,7 @@ do {
         pkix_pl_lifecycle_ObjectTableUpdate(objCountTable); 
     }
 
-    PR_LOG(pkixLog, 1, ("Memory leak test: Loop %d\n", memLeakLoopCount));
+    PR_LOG(pkixLog, 1, ("Memory leak test: Loop %d\n", memLeakLoopCount++));
 #endif /* PKIX_OBJECT_LEAK_TEST */
 
     error =
@@ -2072,7 +2072,7 @@ do {
         pkix_pl_lifecycle_ObjectTableUpdate(objCountTable);
     }
 
-    PR_LOG(pkixLog, 1, ("Memory leak test: Loop %d\n", memLeakLoopCount));
+    PR_LOG(pkixLog, 1, ("Memory leak test: Loop %d\n", memLeakLoopCount++));
 #endif /* PKIX_OBJECT_LEAK_TEST */
 
     error = PKIX_PL_NssContext_Create(

security/nss/lib/libpkix/pkix/top/pkix_build.c

@@ -48,12 +48,10 @@
 
 extern PRLogModuleInfo *pkixLog;
 
-#ifdef PR_LOGGING
+#ifdef DEBUG_kaie
 void
 pkix_trace_dump_cert(const char *info, PKIX_PL_Cert *cert, void *plContext)
 {
-        PKIX_ENTER(FORWARDBUILDERSTATE, "pkix_trace_dump_cert");
-
         if (pkixLog && PR_LOG_TEST(pkixLog, PR_LOG_DEBUG)) {
             PKIX_PL_String *unString;
             char *unAscii;
@@ -1555,6 +1553,7 @@ cleanup:
         PKIX_DECREF(policyChecker);
         PKIX_DECREF(userChecker);
         PKIX_DECREF(userCheckersList);
+        PKIX_DECREF(userCheckerExtOIDs);
 
         PKIX_RETURN(BUILD);
 }
@@ -2673,7 +2672,7 @@ pkix_BuildForwardDepthFirstSearch(
                                     PKIX_VERIFYNODECREATEFAILED);
                     }
 
-#ifdef PR_LOGGING
+#ifdef DEBUG_kaie
                     pkix_trace_dump_cert(
                       "pkix_BuildForwardDepthFirstSearch calling pkix_Build_VerifyCertificate",
                       state->candidateCert, plContext);

security/nss/lib/libpkix/pkix/top/pkix_validate.c

@@ -939,7 +939,7 @@ pkix_CheckChain(
                     continue;
                 }
 
-#ifdef PR_LOGGING
+#ifdef DEBUG_kaie
                 pkix_trace_dump_cert("pkix_CheckChain", cert, plContext);
 #endif
 

security/nss/lib/libpkix/pkix/util/pkix_list.c

@@ -956,6 +956,8 @@ pkix_List_AppendList(
 
 cleanup:
 
+        PKIX_DECREF(item);
+
         PKIX_RETURN(LIST);
 }