diff options
author | ian.mcgreer%sun.com <devnull@localhost> | 2002-03-07 22:53:40 +0000 |
---|---|---|
committer | ian.mcgreer%sun.com <devnull@localhost> | 2002-03-07 22:53:40 +0000 |
commit | 08be8afaa6ae51ec220dcd922fd114ebc4ba1771 (patch) | |
tree | 739b407556528dc211902edbf320593a86e5cd40 /security | |
parent | e7d4e689046953ab217a510ecd0028b51fe6d186 (diff) | |
download | nss-hg-08be8afaa6ae51ec220dcd922fd114ebc4ba1771.tar.gz |
additional change to last patch, suggested by wtc
r=wtc
Diffstat (limited to 'security')
-rw-r--r-- | security/nss/lib/pki/pki3hack.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c index 23e898588..00831c386 100644 --- 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; |