Index: mozilla/security/nss/lib/pkcs12/p12d.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pkcs12/p12d.c,v
retrieving revision 1.32
diff -u -r1.32 mozilla/security/nss/lib/pkcs12/p12d.c
--- mozilla/security/nss/lib/pkcs12/p12d.c
+++ mozilla/security/nss/lib/pkcs12/p12d.c
@@ -2540,10 +2540,16 @@
 SEC_PKCS12DecoderGetCerts(SEC_PKCS12DecoderContext *p12dcx)
 {
     CERTCertList *certList = NULL;
-    sec_PKCS12SafeBag **safeBags = p12dcx->safeBags;
+    sec_PKCS12SafeBag **safeBags;
     int i;
 
-    if (!p12dcx || !p12dcx->safeBags || !p12dcx->safeBags[0]) {
+    if (!p12dcx) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return NULL;
+    }
+    safeBags = p12dcx->safeBags;
+
+    if (!p12dcx->safeBags || !p12dcx->safeBags[0]) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return NULL;
     }