diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-28 23:22:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-28 23:22:48 +0200 |
| commit | 56a7646ab22137cefef418de490112ce9ff2f1aa (patch) | |
| tree | 2579ad34158b6178cccf05c8f0720cf27ba9e067 | |
| parent | 97066792b77578caf2265479d2ee75715a6ef958 (diff) | |
| parent | e520b9e12763cc3719c02fb5ebd538e89644a35c (diff) | |
| download | php-git-56a7646ab22137cefef418de490112ce9ff2f1aa.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | Zend/tests/array_literal_next_element_error.phpt | 9 | ||||
| -rw-r--r-- | Zend/tests/const_array_with_resource_key.phpt | 15 | ||||
| -rw-r--r-- | Zend/zend_ast.c | 10 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 6 |
4 files changed, 38 insertions, 2 deletions
diff --git a/Zend/tests/array_literal_next_element_error.phpt b/Zend/tests/array_literal_next_element_error.phpt index 59ffeb02c7..8b4af3cadd 100644 --- a/Zend/tests/array_literal_next_element_error.phpt +++ b/Zend/tests/array_literal_next_element_error.phpt @@ -7,6 +7,9 @@ $i = PHP_INT_MAX; $array = [$i => 42, new stdClass]; var_dump($array); +const FOO = [PHP_INT_MAX => 42, "foo"]; +var_dump(FOO); + ?> --EXPECTF-- Warning: Cannot add element to the array as the next element is already occupied in %s on line %d @@ -14,3 +17,9 @@ array(1) { [%d]=> int(42) } + +Warning: Cannot add element to the array as the next element is already occupied in %s on line %d +array(1) { + [%d]=> + int(42) +} diff --git a/Zend/tests/const_array_with_resource_key.phpt b/Zend/tests/const_array_with_resource_key.phpt new file mode 100644 index 0000000000..0bf546af50 --- /dev/null +++ b/Zend/tests/const_array_with_resource_key.phpt @@ -0,0 +1,15 @@ +--TEST-- +Constexpr arrays should be able to handle resource keys +--FILE-- +<?php + +const FOO = [STDIN => 42]; +var_dump(FOO); + +?> +--EXPECTF-- +Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +array(1) { + [%d]=> + int(42) +} diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 236d0783fc..0e04d86dff 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -181,7 +181,11 @@ static int zend_ast_add_array_element(zval *result, zval *offset, zval *expr) { switch (Z_TYPE_P(offset)) { case IS_UNDEF: - zend_hash_next_index_insert(Z_ARRVAL_P(result), expr); + if (!zend_hash_next_index_insert(Z_ARRVAL_P(result), expr)) { + zend_error(E_WARNING, + "Cannot add element to the array as the next element is already occupied"); + zval_ptr_dtor(expr); + } break; case IS_STRING: zend_symtable_update(Z_ARRVAL_P(result), Z_STR_P(offset), expr); @@ -202,6 +206,10 @@ static int zend_ast_add_array_element(zval *result, zval *offset, zval *expr) case IS_DOUBLE: zend_hash_index_update(Z_ARRVAL_P(result), zend_dval_to_lval(Z_DVAL_P(offset)), expr); break; + case IS_RESOURCE: + zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset)); + zend_hash_index_update(Z_ARRVAL_P(result), Z_RES_HANDLE_P(offset), expr); + break; default: zend_throw_error(NULL, "Illegal offset type"); return FAILURE; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 87590e71e4..04fd3adffa 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6628,7 +6628,11 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ break; } } else { - zend_hash_next_index_insert(Z_ARRVAL_P(result), value); + if (!zend_hash_next_index_insert(Z_ARRVAL_P(result), value)) { + zval_ptr_dtor_nogc(value); + zval_ptr_dtor(result); + return 0; + } } } |