diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 00:43:43 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 00:43:43 +0100 |
| commit | dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0 (patch) | |
| tree | c70154c611b0f03bdcba029f1c51c48e5f69eb36 /security/nss/lib/pk11wrap/pk11merge.c | |
| parent | 6f93b00559c8fe5b8dfaf59fcbaac8f1e0dd3366 (diff) | |
| parent | 788c588bf6f8907dc57b01cd1c86239215d3c661 (diff) | |
| download | UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.gz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.lz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.xz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.zip | |
Merge branch 'TLS-1.3'
Diffstat (limited to 'security/nss/lib/pk11wrap/pk11merge.c')
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11merge.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/nss/lib/pk11wrap/pk11merge.c b/security/nss/lib/pk11wrap/pk11merge.c index 8c4c5129a..b2101b819 100644 --- a/security/nss/lib/pk11wrap/pk11merge.c +++ b/security/nss/lib/pk11wrap/pk11merge.c @@ -68,8 +68,11 @@ pk11_copyAttributes(PLArenaPool *arena, copyTemplate, copyTemplateCount); /* if we have missing attributes, just skip them and create the object */ if (crv == CKR_ATTRIBUTE_TYPE_INVALID) { - int i, j; + CK_ULONG i, j; newTemplate = PORT_NewArray(CK_ATTRIBUTE, copyTemplateCount); + if (!newTemplate) { + return SECFailure; + } /* remove the unknown attributes. If we don't have enough attributes * PK11_CreateNewObject() will fail */ for (i = 0, j = 0; i < copyTemplateCount; i++) { @@ -1258,6 +1261,7 @@ pk11_newMergeLogNode(PLArenaPool *arena, /* initialize it */ obj->slot = slot; obj->objectID = id; + obj->owner = PR_FALSE; newLog->object = obj; newLog->error = error; |