clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally free depending on how assignment happened

Browse Source
This commit is contained in:
Leigh 2017-01-06 15:24:37 +00:00
parent 053b966134
commit 9a0dac124e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/openssl/openssl.c
View File

@ -667,9 +667,9 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
}
for (i = 0; i < X509_NAME_entry_count(name); i++) {
unsigned char *to_add;
unsigned char *to_add = NULL;
int to_add_len = 0;
int needs_free = 0;
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
@ -684,6 +684,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
str = X509_NAME_ENTRY_get_data(ne);
if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
to_add_len = ASN1_STRING_to_UTF8(&to_add, str);
needs_free = 1;
} else {
to_add = ASN1_STRING_data(str);
to_add_len = ASN1_STRING_length(str);
@ -704,8 +705,13 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
}
}
OPENSSL_free(to_add);
if (needs_free) {
OPENSSL_free(to_add);
to_add = NULL;
needs_free = 0;
}
}
if (key != NULL) {
zend_hash_str_update(Z_ARRVAL_P(val), key, strlen(key), &subitem);
}