summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn M. Schanck <jschanck@mozilla.com>2022-05-11 18:23:00 +0000
committerJohn M. Schanck <jschanck@mozilla.com>2022-05-11 18:23:00 +0000
commitac4fbec717b61d6bcafdc1f25839276b5f6a99f3 (patch)
treecf23b9676f74b9f02577525eaa299cd952b6685d
parent360c7d932b3a14bdb5abe6e22dfd140b3b8b3636 (diff)
downloadnss-hg-ac4fbec717b61d6bcafdc1f25839276b5f6a99f3.tar.gz
Bug 1454072 - Use of uninitialized pointer in lg_init after alloc fail. r=nss-reviewers,nkulatova
Differential Revision: https://phabricator.services.mozilla.com/D142715
-rw-r--r--lib/softoken/legacydb/lginit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/softoken/legacydb/lginit.c b/lib/softoken/legacydb/lginit.c
index d3b4ff32f..3cd4d8ea0 100644
--- a/lib/softoken/legacydb/lginit.c
+++ b/lib/softoken/legacydb/lginit.c
@@ -515,6 +515,7 @@ lg_init(SDB **pSdb, int flags, NSSLOWCERTCertDBHandle *certdbPtr,
lgdb_p->hashTable = PL_NewHashTable(64, lg_HashNumber, PL_CompareValues,
SECITEM_HashCompare, NULL, 0);
if (lgdb_p->hashTable == NULL) {
+ PR_DestroyLock(lgdb_p->dbLock);
goto loser;
}
@@ -548,12 +549,6 @@ loser:
PORT_Free(sdb);
}
if (lgdb_p) {
- if (lgdb_p->dbLock) {
- PR_DestroyLock(lgdb_p->dbLock);
- }
- if (lgdb_p->hashTable) {
- PL_HashTableDestroy(lgdb_p->hashTable);
- }
PORT_Free(lgdb_p);
}
return error;