additional change to last patch, suggested by wtc

r=wtc
sailfishos-mirror · Mar 7, 2002 · 00cf137 · 00cf137
1 parent 00952a3
commit 00cf137
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
@@ -827,11 +827,9 @@ fill_CERTCertificateFields(NSSCertificate *c, CERTCertificate *cc, PRBool forced
     NSSCryptoContext *context = c->object.cryptoContext;
     nssCryptokiInstance *instance = get_cert_instance(c);
     NSSUTF8 *stanNick;
-    if (instance) {
-	stanNick = instance->label;
-    } else if (context) {
-	stanNick = c->object.tempName;
-    }
+    /* must live somewhere */
+    PORT_Assert(instance != NULL || context != NULL);
+    stanNick = instance ? instance->label : c->object.tempName;
     /* fill other fields needed by NSS3 functions using CERTCertificate */
     if ((!cc->nickname && stanNick) || forced) {
 	PRStatus nssrv;