diff options
author | wtc%netscape.com <devnull@localhost> | 2002-03-08 00:02:35 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-03-08 00:02:35 +0000 |
commit | e7854aca8950e9da1e24cb805f2d8e1bd1840c6c (patch) | |
tree | d0d46eac0f0b91c8ec4020956d498471595e3e24 | |
parent | 210f05bc8f288604a22abad3d2d861f4d9d39874 (diff) | |
download | nss-hg-e7854aca8950e9da1e24cb805f2d8e1bd1840c6c.tar.gz |
Bugzilla bug 129298: the assertion may be false. Remove it, and initialize
stanNick to NULL. r=mcgreer.
-rw-r--r-- | security/nss/lib/pki/pki3hack.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c index 6752281f8..d26a68d2c 100644 --- a/security/nss/lib/pki/pki3hack.c +++ b/security/nss/lib/pki/pki3hack.c @@ -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; |