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 /Zend/zend_ast.c | |
parent | 97066792b77578caf2265479d2ee75715a6ef958 (diff) | |
parent | e520b9e12763cc3719c02fb5ebd538e89644a35c (diff) | |
download | php-git-56a7646ab22137cefef418de490112ce9ff2f1aa.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_ast.c')
-rw-r--r-- | Zend/zend_ast.c | 10 |
1 files changed, 9 insertions, 1 deletions
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; |