diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-06-27 13:07:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-06-27 13:07:36 +0800 |
| commit | 3521661bd1be100169c3f21920dfa04fc53b2adb (patch) | |
| tree | 4f72135b5a2eb7c62c985c6ac786f248a0ce0880 /Zend/zend_execute.c | |
| parent | 2458dab466cbc8088a9c5ac4eff3785321ea55c8 (diff) | |
| parent | d1b1866a3a035b946e50b17eeefd19add81c7eab (diff) | |
| download | php-git-3521661bd1be100169c3f21920dfa04fc53b2adb.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Conflicts:
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 8a9ddb2d8d..3edbb9c7d6 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1651,7 +1651,9 @@ fetch_from_array: zend_throw_error(NULL, "[] operator not supported for strings"); } else { zend_check_string_offset(dim, type EXECUTE_DATA_CC); - zend_wrong_string_offset(EXECUTE_DATA_C); + if (EXPECTED(EG(exception) == NULL)) { + zend_wrong_string_offset(EXECUTE_DATA_C); + } } ZVAL_ERROR(result); } else if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { |