Checking return value of NSS_Shutdown() - bug 171263

2 files changed, 8 insertions, 3 deletions

diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index d0ba98ee8..255c189d9 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -860,6 +860,8 @@ main(int argc, char **argv)
 
 done:
     if (slot) PK11_FreeSlot(slot);
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+	exit(1);
+    }
     exit(pk12uErrno);
 }
diff --git a/security/nss/cmd/vfychain/vfychain.c b/security/nss/cmd/vfychain/vfychain.c
index 831e198dc..91189ed19 100644
--- a/security/nss/cmd/vfychain/vfychain.c
+++ b/security/nss/cmd/vfychain/vfychain.c
@@ -122,7 +122,8 @@ exitErr(char *function)
 {
     errWarn(function);
     /* Exit gracefully. */
-    NSS_Shutdown();
+    /* ignoring return value of NSS_Shutdown as code exits with 1 anyway*/
+    (void) NSS_Shutdown();
     PR_Cleanup();
     exit(1);
 }
@@ -429,7 +430,9 @@ breakout:
 
 punt:
     forgetCerts();
-    NSS_Shutdown();
+    if (NSS_Shutdown != SECSuccess) {
+	exit(1);
+    }
     PR_Cleanup();
     return 0;
 }