diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-05-04 17:05:05 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-05-04 17:05:05 +0100 |
| commit | 8bec3dae94a3acb89725ca1f50607b554930f583 (patch) | |
| tree | b55fe70c745dbb32cbe4c9431ad7ec19d6e5836d /Zend/zend_execute.c | |
| parent | 3048092f5bf476142494796baac458e474c8b2b6 (diff) | |
| parent | b91197c8a3c5689f77255722d7beb0e9786bc432 (diff) | |
| download | php-git-8bec3dae94a3acb89725ca1f50607b554930f583.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index eb685e8104..53f2362e19 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1559,24 +1559,24 @@ try_again: if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) { hval = Z_LVAL_P(dim); num_index: - retval = zend_hash_index_find(ht, hval); - if (retval == NULL) { - switch (type) { - case BP_VAR_R: - zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); - /* break missing intentionally */ - case BP_VAR_UNSET: - case BP_VAR_IS: - retval = &EG(uninitialized_zval); - break; - case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); - retval = zend_hash_index_update(ht, hval, &EG(uninitialized_zval)); - break; - case BP_VAR_W: - retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval)); - break; - } + ZEND_HASH_INDEX_FIND(ht, hval, retval, num_undef); + return retval; +num_undef: + switch (type) { + case BP_VAR_R: + zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); + /* break missing intentionally */ + case BP_VAR_UNSET: + case BP_VAR_IS: + retval = &EG(uninitialized_zval); + break; + case BP_VAR_RW: + zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); + retval = zend_hash_index_update(ht, hval, &EG(uninitialized_zval)); + break; + case BP_VAR_W: + retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval)); + break; } } else if (EXPECTED(Z_TYPE_P(dim) == IS_STRING)) { offset_key = Z_STR_P(dim); |