diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-28 23:12:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-28 23:22:11 +0200 |
| commit | e520b9e12763cc3719c02fb5ebd538e89644a35c (patch) | |
| tree | 59a511d6668565673bb866895d13b47b8d2dcbf1 /Zend/zend_compile.c | |
| parent | 437942d972c15e17539e9029205a1198bb597b90 (diff) | |
| parent | 1f5412982cd65800b061cef4877d0fd87662568b (diff) | |
| download | php-git-e520b9e12763cc3719c02fb5ebd538e89644a35c.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7c4d9d5e1d..53cafcb56d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5950,7 +5950,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; + } } } |