Skip to content

Commit

Permalink
Bugzilla bug 129298: the assertion may be false. Remove it, and initi…
Browse files Browse the repository at this point in the history
…alize

stanNick to NULL.  r=mcgreer.
  • Loading branch information
wtc%netscape.com committed Mar 8, 2002
1 parent 3e44378 commit 423edb9
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions security/nss/lib/pki/pki3hack.c
Expand Up @@ -829,10 +829,12 @@ fill_CERTCertificateFields(NSSCertificate *c, CERTCertificate *cc, PRBool forced
NSSTrust *nssTrust;
NSSCryptoContext *context = c->object.cryptoContext;
nssCryptokiInstance *instance = get_cert_instance(c);
NSSUTF8 *stanNick;
/* must live somewhere */
PORT_Assert(instance != NULL || context != NULL);
stanNick = instance ? instance->label : c->object.tempName;
NSSUTF8 *stanNick = NULL;
if (instance) {
stanNick = instance->label;
} else if (context) {
stanNick = c->object.tempName;
}
/* fill other fields needed by NSS3 functions using CERTCertificate */
if ((!cc->nickname && stanNick) || forced) {
PRStatus nssrv;
Expand Down

0 comments on commit 423edb9

Please sign in to comment.