Skip to content

Fix GH-20042: SEGV in array.c when error handler clobbers IAP object #21461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −4
Open

Fix GH-20042: SEGV in array.c when error handler clobbers IAP object #21461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,10 @@ static inline HashTable *get_ht_for_iap(zval *zv, bool separate) {
php_error_docref(NULL, E_DEPRECATED,
"Calling %s() on an object is deprecated", get_active_function_name());

if (UNEXPECTED(Z_TYPE_P(zv) != IS_OBJECT)) {
return NULL;
}

zend_object *zobj = Z_OBJ_P(zv);
if (separate && zobj->properties && UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
Expand Down Expand Up @@ -982,7 +986,7 @@ PHP_FUNCTION(end)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
if (zend_hash_num_elements(array) == 0) {
if (!array || zend_hash_num_elements(array) == 0) {
/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
RETURN_FALSE;
}
Expand All @@ -1004,7 +1008,7 @@ PHP_FUNCTION(prev)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
if (zend_hash_num_elements(array) == 0) {
if (!array || zend_hash_num_elements(array) == 0) {
/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
RETURN_FALSE;
}
Expand All @@ -1026,7 +1030,7 @@ PHP_FUNCTION(next)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
if (zend_hash_num_elements(array) == 0) {
if (!array || zend_hash_num_elements(array) == 0) {
/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
RETURN_FALSE;
}
Expand All @@ -1048,7 +1052,7 @@ PHP_FUNCTION(reset)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
if (zend_hash_num_elements(array) == 0) {
if (!array || zend_hash_num_elements(array) == 0) {
/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
RETURN_FALSE;
}
Expand All @@ -1070,6 +1074,9 @@ PHP_FUNCTION(current)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
if (!array) {
RETURN_FALSE;
}
php_array_iter_return_current(return_value, array, true);
}
/* }}} */
Expand All @@ -1084,6 +1091,9 @@ PHP_FUNCTION(key)
ZEND_PARSE_PARAMETERS_END();

HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
if (!array) {
RETURN_NULL();
}
zval *entry = php_array_iter_seek_current(array, true);
if (EXPECTED(entry)) {
zend_hash_get_current_key_zval(array, return_value);
Expand Down
20 changes: 20 additions & 0 deletions ext/standard/tests/array/gh20042.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
GH-20042 (SEGV in array.c when error handler clobbers IAP object argument)
--FILE--
<?php
foreach (['prev', 'next', 'end', 'reset', 'current', 'key'] as $func) {
$obj = new stdClass;
set_error_handler(function () use (&$obj) {
$obj = 0;
});
var_dump($func($obj));
restore_error_handler();
}
?>
--EXPECT--
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
NULL
Loading