mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

property: correctly set the has optional flag when merging property lists

Browse Source 
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12123)
This commit is contained in:
Pauli 2020-06-15 10:07:50 +10:00
parent f9e504e8b1
commit e3d6dc59fb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/property/property_parse.c
View File

@ -568,6 +568,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
if (r == NULL) if (r == NULL)
return NULL; return NULL;
r->has_optional = 0;
for (i = j = n = 0; i < a->n || j < b->n; n++) { for (i = j = n = 0; i < a->n || j < b->n; n++) {
if (i >= a->n) { if (i >= a->n) {
copy = &bp[j++]; copy = &bp[j++];
@ -581,6 +582,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
copy = &bp[j++]; copy = &bp[j++];
} }
memcpy(r->properties + n, copy, sizeof(r->properties[0])); memcpy(r->properties + n, copy, sizeof(r->properties[0]));
r->has_optional |= copy->optional;
} }
r->n = n; r->n = n;
if (n != t) if (n != t)