diff options
author | Xinchen Hui <laruence@gmail.com> | 2018-06-27 13:05:11 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2018-06-27 13:05:11 +0800 |
commit | d1b1866a3a035b946e50b17eeefd19add81c7eab (patch) | |
tree | 7ead754956797c40fb68a7f3b26d3872532b1fb7 /Zend/zend_execute.c | |
parent | 6b5597f7d8e31933dfb833dd443290adc02ca307 (diff) | |
download | php-git-d1b1866a3a035b946e50b17eeefd19add81c7eab.tar.gz |
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
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 968618a6aa..f88fac6c88 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1700,7 +1700,9 @@ fetch_from_array: zend_throw_error(NULL, "[] operator not supported for strings"); } else { zend_check_string_offset(dim, type); - zend_wrong_string_offset(); + if (EXPECTED(EG(exception) == NULL)) { + zend_wrong_string_offset(); + } } ZVAL_ERROR(result); } else if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { |