From 44f82b17bbfad4021213b74186fffeeb30082816 Mon Sep 17 00:00:00 2001
From: "neil.williams%sun.com" <devnull@localhost>
Date: Wed, 16 Nov 2005 00:59:18 +0000
Subject: Bug 315135, pk12util -w <non-existent pwfile> causes seg fault.
 r=nelson

---
 security/nss/cmd/pk12util/pk12util.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'security/nss')

diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index 69fa49e82..1d15f1663 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -301,6 +301,9 @@ P12U_GetP12FilePassword(PRBool confirmPw, secuPWData *p12FilePw)
 	p0 = p12FilePw->data;
     }
 
+    if (p0 == NULL) {
+        return NULL;
+    }
     pwItem = SECITEM_AllocItem(NULL, NULL, PL_strlen(p0) + 1);
     memcpy(pwItem->data, p0, pwItem->len);
 
-- 
cgit v1.2.1