diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-02-21 22:22:33 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-02-21 22:22:33 +0000 |
| commit | dbd0989f24000b0a31a1f3354c86abb54b394e95 (patch) | |
| tree | 78778b31cf0417c1805fa6ed7b272403cbefe8eb | |
| parent | b5d42d36725b56605038c79b79d913ba2fa08559 (diff) | |
| download | nss-hg-dbd0989f24000b0a31a1f3354c86abb54b394e95.tar.gz | |
Fix bug 69471 and bug 69472 : Memory leak in PK11_VerifyMechanisms and incorrectly
calling EnterSlotMonitor rather than ExitSlotMonitor on an error condition.
bob
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11slot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c index 93d9530a2..571177438 100644 --- a/security/nss/lib/pk11wrap/pk11slot.c +++ b/security/nss/lib/pk11wrap/pk11slot.c @@ -1411,6 +1411,7 @@ PK11_VerifyMechanism(PK11SlotInfo *slot,PK11SlotInfo *intern, unsigned char encRef[8]; int outLenTest,outLenRef; int key_size = 0; + PRBool verify = PR_FALSE; SECStatus rv; if ((mech == CKM_RC2_CBC) || (mech == CKM_RC2_ECB) || (mech == CKM_RC4)) { @@ -1449,7 +1450,7 @@ PK11_VerifyMechanism(PK11SlotInfo *slot,PK11SlotInfo *intern, if (outLenTest != outLenRef) goto loser; if (PORT_Memcmp(encTest, encRef, outLenTest) != 0) goto loser; - return PR_TRUE; + verify = PR_TRUE; loser: if (test) PK11_DestroyContext(test,PR_TRUE); @@ -1458,7 +1459,7 @@ loser: if (reference) PK11_DestroyContext(reference,PR_TRUE); if (param) SECITEM_FreeItem(param,PR_TRUE); - return PR_FALSE; + return verify; } /* @@ -1881,7 +1882,7 @@ pk11_IsPresentCertLoad(PK11SlotInfo *slot, PRBool loadCerts) /* removable slots have a flag that says they are present */ if (!slot->isThreadSafe) PK11_EnterSlotMonitor(slot); if (PK11_GETTAB(slot)->C_GetSlotInfo(slot->slotID,&slotInfo) != CKR_OK) { - if (!slot->isThreadSafe) PK11_EnterSlotMonitor(slot); + if (!slot->isThreadSafe) PK11_ExitSlotMonitor(slot); return PR_FALSE; } if ((slotInfo.flags & CKF_TOKEN_PRESENT) == 0) { |