diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-07 11:16:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-07 11:16:24 +0100 |
| commit | 8d2a9d8859db8c3b35e44ae55f0bdadeb594d872 (patch) | |
| tree | 2e444725bbe99b18aa94875b9455e1bbfc488e63 | |
| parent | 6d4965febdb1745444e7a3408fa7c01bcfc52b68 (diff) | |
| parent | 5fa6dcd972e868fd6177b6620b44734d55eceab3 (diff) | |
| download | php-git-8d2a9d8859db8c3b35e44ae55f0bdadeb594d872.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78759
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/standard/array.c | 8 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug78759.phpt | 15 |
3 files changed, 22 insertions, 4 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #78787 (Segfault with trait overriding inherited private shadow property). (Nikita) +- Standard: + . Fixed bug #78759 (array_search in $GLOBALS). (Nikita) + 21 Nov 2019, PHP 7.3.12 - Core: diff --git a/ext/standard/array.c b/ext/standard/array.c index 44991cb22a..300f714932 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1563,7 +1563,7 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) ZEND_PARSE_PARAMETERS_END(); if (strict) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(array), num_idx, str_idx, entry) { ZVAL_DEREF(entry); if (fast_is_identical_function(value, entry)) { if (behavior == 0) { @@ -1580,7 +1580,7 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) } ZEND_HASH_FOREACH_END(); } else { if (Z_TYPE_P(value) == IS_LONG) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(array), num_idx, str_idx, entry) { if (fast_equal_check_long(value, entry)) { if (behavior == 0) { RETURN_TRUE; @@ -1595,7 +1595,7 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) } } ZEND_HASH_FOREACH_END(); } else if (Z_TYPE_P(value) == IS_STRING) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(array), num_idx, str_idx, entry) { if (fast_equal_check_string(value, entry)) { if (behavior == 0) { RETURN_TRUE; @@ -1610,7 +1610,7 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) } } ZEND_HASH_FOREACH_END(); } else { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(array), num_idx, str_idx, entry) { if (fast_equal_check_function(value, entry)) { if (behavior == 0) { RETURN_TRUE; diff --git a/ext/standard/tests/array/bug78759.phpt b/ext/standard/tests/array/bug78759.phpt new file mode 100644 index 0000000000..55cd29667c --- /dev/null +++ b/ext/standard/tests/array/bug78759.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #78759: array_search in $GLOBALS +--FILE-- +<?php + +$a = 22; +var_dump($GLOBALS["a"]); // int 22 +var_dump(array_search(22, $GLOBALS)); // false +var_dump(array_search(22, $GLOBALS, true)); // false + +?> +--EXPECT-- +int(22) +string(1) "a" +string(1) "a" |