summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-01 16:31:31 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-01 16:31:31 +0200
commitaa6329b694a981dccd5b0fd124936c4b54fb94a4 (patch)
tree49eee21ad78c09f9575d938bb824c605dab5e6f7
parent46450ce7de0aa5e27a2dfb49afe66b0de6130556 (diff)
downloadUXP-aa6329b694a981dccd5b0fd124936c4b54fb94a4.tar
UXP-aa6329b694a981dccd5b0fd124936c4b54fb94a4.tar.gz
UXP-aa6329b694a981dccd5b0fd124936c4b54fb94a4.tar.lz
UXP-aa6329b694a981dccd5b0fd124936c4b54fb94a4.tar.xz
UXP-aa6329b694a981dccd5b0fd124936c4b54fb94a4.zip
Don't leak newTemplate in pk11_copyAttributes()
Cherry-pick of NSS fix from 3.37
-rw-r--r--security/nss/lib/pk11wrap/pk11merge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/nss/lib/pk11wrap/pk11merge.c b/security/nss/lib/pk11wrap/pk11merge.c
index b2101b819..c6125b6e6 100644
--- a/security/nss/lib/pk11wrap/pk11merge.c
+++ b/security/nss/lib/pk11wrap/pk11merge.c
@@ -74,7 +74,7 @@ pk11_copyAttributes(PLArenaPool *arena,
return SECFailure;
}
/* remove the unknown attributes. If we don't have enough attributes
- * PK11_CreateNewObject() will fail */
+ * PK11_CreateNewObject() will fail */
for (i = 0, j = 0; i < copyTemplateCount; i++) {
if (copyTemplate[i].ulValueLen != -1) {
newTemplate[j] = copyTemplate[i];
@@ -88,6 +88,7 @@ pk11_copyAttributes(PLArenaPool *arena,
}
if (crv != CKR_OK) {
PORT_SetError(PK11_MapError(crv));
+ PORT_Free(newTemplate);
return SECFailure;
}
if (targetID == CK_INVALID_HANDLE) {
@@ -100,7 +101,7 @@ pk11_copyAttributes(PLArenaPool *arena,
copyTemplate, copyTemplateCount);
}
if (newTemplate) {
- free(newTemplate);
+ PORT_Free(newTemplate);
}
return rv;
}