diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
| commit | 4c9914227ed9e675d65ad16e0bb899e8107a0ee5 (patch) | |
| tree | d4c542f51b5155eb3f3627c628686cfc0d648a2f /security | |
| parent | de01f1e7fce43d5919e6adcd73dfa617a9087520 (diff) | |
| parent | aa6329b694a981dccd5b0fd124936c4b54fb94a4 (diff) | |
| download | uxp-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.tar.gz | |
Merge branch 'ported-upstream'
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/nss/lib/pk11wrap/pk11merge.c b/security/nss/lib/pk11wrap/pk11merge.c index b2101b8191..c6125b6e63 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; } |