diff options
author | wtc%netscape.com <devnull@localhost> | 2002-04-11 22:13:47 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-04-11 22:13:47 +0000 |
commit | fcac19188c20600a8f15583aa62916fa27927e51 (patch) | |
tree | 66e7984b88ed1f6ec2b470d0c7de8fbed97578aa | |
parent | 09ec0413d895c18a7361c84acaed49b02954c519 (diff) | |
download | nss-hg-fcac19188c20600a8f15583aa62916fa27927e51.tar.gz |
Merged the fix for Bugzilla bug 136625 on the MOZILLA_1_0_0_BRANCH.
r=relyea. a=jaimejr@netscape.com adt1.0.0+ (on ADT's behalf).
-rw-r--r-- | security/nss/lib/softoken/pkcs11.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c index bd20ea8b8..e8beefac9 100644 --- a/security/nss/lib/softoken/pkcs11.c +++ b/security/nss/lib/softoken/pkcs11.c @@ -3624,6 +3624,10 @@ pk11_cert_collect(NSSLOWCERTCertificate *cert,void *arg) { pk11CertData *cd = (pk11CertData *)arg; + if (cert == NULL) { + return SECSuccess; + } + if (cd->certs == NULL) { return SECFailure; } |