summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthayes%netscape.com <devnull@localhost>2000-06-12 20:19:39 +0000
committerthayes%netscape.com <devnull@localhost>2000-06-12 20:19:39 +0000
commit1dcdf6279d0b237aee003105a3a5c6db147432af (patch)
tree9e45f1c067fbb71803bb12350424d19ed1a05542
parent779b2555bb69fda1a21e3d494b4a1aac2e662f9d (diff)
downloadnss-hg-1dcdf6279d0b237aee003105a3a5c6db147432af.tar.gz
Fix cleanup code in Decrypt to check for NULL pointers
-rw-r--r--security/nss/lib/pk11wrap/pk11sdr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/lib/pk11wrap/pk11sdr.c b/security/nss/lib/pk11wrap/pk11sdr.c
index 07d9c1354..6e84e2261 100644
--- a/security/nss/lib/pk11wrap/pk11sdr.c
+++ b/security/nss/lib/pk11wrap/pk11sdr.c
@@ -278,11 +278,11 @@ PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
loser:
SECITEM_ZfreeItem(&paddedResult, PR_FALSE);
- PORT_FreeArena(arena, PR_TRUE);
- PK11_DestroyContext(ctx, PR_TRUE);
- PK11_FreeSymKey(key);
- SECITEM_ZfreeItem(params, PR_TRUE);
- PK11_FreeSlot(slot);
+ if (arena) PORT_FreeArena(arena, PR_TRUE);
+ if (ctx) PK11_DestroyContext(ctx, PR_TRUE);
+ if (key) PK11_FreeSymKey(key);
+ if (params) SECITEM_ZfreeItem(params, PR_TRUE);
+ if (slot) PK11_FreeSlot(slot);
return rv;
}