diff options
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbstring.c | 8 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug77165.phpt | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 6554bd72bf..ae8c4bef7f 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3125,7 +3125,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons php_error_docref(NULL, E_WARNING, "Cannot convert recursively referenced values"); return NULL; } - GC_PROTECT_RECURSION(input); + GC_TRY_PROTECT_RECURSION(input); output = zend_new_array(zend_hash_num_elements(input)); ZEND_HASH_FOREACH_KEY_VAL(input, idx, key, entry) { /* convert key */ @@ -3170,7 +3170,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons zend_hash_index_add(output, idx, &entry_tmp); } } ZEND_HASH_FOREACH_END(); - GC_UNPROTECT_RECURSION(input); + GC_TRY_UNPROTECT_RECURSION(input); return output; } @@ -4738,7 +4738,7 @@ MBSTRING_API int php_mb_check_encoding_recursive(HashTable *vars, const zend_str php_error_docref(NULL, E_WARNING, "Cannot not handle circular references"); return 0; } - GC_PROTECT_RECURSION(vars); + GC_TRY_PROTECT_RECURSION(vars); ZEND_HASH_FOREACH_KEY_VAL(vars, idx, key, entry) { ZVAL_DEREF(entry); if (key) { @@ -4772,7 +4772,7 @@ MBSTRING_API int php_mb_check_encoding_recursive(HashTable *vars, const zend_str break; } } ZEND_HASH_FOREACH_END(); - GC_UNPROTECT_RECURSION(vars); + GC_TRY_UNPROTECT_RECURSION(vars); mbfl_buffer_converter_delete(convd); return valid; } diff --git a/ext/mbstring/tests/bug77165.phpt b/ext/mbstring/tests/bug77165.phpt new file mode 100644 index 0000000000..69708f613a --- /dev/null +++ b/ext/mbstring/tests/bug77165.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #77165: mb_check_encoding crashes when argument given an empty array +--FILE-- +<?php +var_dump(mb_check_encoding(array())); +var_dump(mb_convert_encoding(array(), 'UTF-8')); +?> +--EXPECT-- +bool(true) +array(0) { +} |