php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary string refcounting in ext/mbstring (#17892)

Browse Source
This commit is contained in:
Niels Dossche
2025-02-23 00:23:53 +01:00
committed by GitHub
parent 03f97fc34b
commit b1841fdfa2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/mbstring/mbstring.c
View File

@@ -390,7 +390,8 @@ static zend_result php_mb_parse_encoding_array(HashTable *target_hash, const mbf
size_t n = 0;
zval *hash_entry;
ZEND_HASH_FOREACH_VAL(target_hash, hash_entry) {
zend_string *encoding_str = zval_try_get_string(hash_entry);
zend_string *tmp_encoding_str;
zend_string *encoding_str = zval_try_get_tmp_string(hash_entry, &tmp_encoding_str);
if (UNEXPECTED(!encoding_str)) {
efree(ZEND_VOIDP(list));
return FAILURE;
@@ -415,12 +416,12 @@ static zend_result php_mb_parse_encoding_array(HashTable *target_hash, const mbf
n++;
} else {
zend_argument_value_error(arg_num, "contains invalid encoding \"%s\"", ZSTR_VAL(encoding_str));
zend_string_release(encoding_str);
zend_tmp_string_release(tmp_encoding_str);
efree(ZEND_VOIDP(list));
return FAILURE;
}
}
zend_string_release(encoding_str);
zend_tmp_string_release(tmp_encoding_str);
} ZEND_HASH_FOREACH_END();
*return_list = list;
*return_size = n;