summaryrefslogtreecommitdiff
path: root/security/nss/lib/nss/nssinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/lib/nss/nssinit.c')
-rw-r--r--security/nss/lib/nss/nssinit.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c
index b1322668c..8ee45528d 100644
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -155,8 +155,10 @@ nss_OpenKeyDB(const char * configdir, const char *prefix, PRBool readOnly)
if (name == NULL)
return SECFailure;
keydb = SECKEY_OpenKeyDB(readOnly, nss_keydb_name_cb, (void *)name);
- if (keydb == NULL)
+ if (keydb == NULL) {
+ PORT_Free(name);
return SECFailure;
+ }
SECKEY_SetDefaultKeyDB(keydb);
PORT_Free(name);
return SECSuccess;
@@ -361,6 +363,10 @@ NSS_NoDB_Init(const char * configdir)
return rv;
}
RNG_SystemInfoForRNG();
+
+ if (secoid_Init() != SECSuccess) {
+ return rv;
+ }
rv = nss_OpenVolatileCertDB();
if (rv != SECSuccess) {