diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2003-12-06 06:52:53 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2003-12-06 06:52:53 +0000 |
| commit | 6b3b61bc11bda524f1c463b1f36b3dbde52d5a2f (patch) | |
| tree | 085e50d9a76c2a4eb0df76899996d4fa3c8f6de9 /security/nss/lib/certdb | |
| parent | 968bf7e5a3c8028dfed25082d0e930f9404fabaa (diff) | |
| download | nss-hg-6b3b61bc11bda524f1c463b1f36b3dbde52d5a2f.tar.gz | |
CERT_ImportCerts now returns SECFailure when NONE of the certs was succesfully imported. r=wtc. Bugscape bug 54311.
Diffstat (limited to 'security/nss/lib/certdb')
| -rw-r--r-- | security/nss/lib/certdb/certdb.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/security/nss/lib/certdb/certdb.c b/security/nss/lib/certdb/certdb.c index 5c1adc99d..a898b0f27 100644 --- a/security/nss/lib/certdb/certdb.c +++ b/security/nss/lib/certdb/certdb.c @@ -2245,7 +2245,7 @@ CERT_ImportCerts(CERTCertDBHandle *certdb, SECCertUsage usage, unsigned int fcerts = 0; if ( ncerts ) { - certs = (CERTCertificate**)PORT_ZAlloc(sizeof(CERTCertificate *) * ncerts ); + certs = PORT_ZNewArray(CERTCertificate*, ncerts); if ( certs == NULL ) { return(SECFailure); } @@ -2306,18 +2306,7 @@ CERT_ImportCerts(CERTCertDBHandle *certdb, SECCertUsage usage, } } - return(SECSuccess); - -#if 0 /* dead code here - why ?? XXX */ -loser: - if ( retCerts ) { - *retCerts = NULL; - } - if ( certs ) { - CERT_DestroyCertArray(certs, ncerts); - } - return(SECFailure); -#endif + return (fcerts ? SECSuccess : SECFailure); } /* |