diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 14:10:23 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 14:10:23 +0300 |
| commit | dbd1ecd09f26015451063c6d545c9ab929a12129 (patch) | |
| tree | 4e8c026628bd257c7b30d9fd3891693c004e8215 /Zend/zend_operators.c | |
| parent | 3820296c42e146cc080bc24314ccdfdd700e743e (diff) | |
| parent | be74ca497680ef544af1f650fe4717a3e0d0af67 (diff) | |
| download | php-git-dbd1ecd09f26015451063c6d545c9ab929a12129.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Support for exceptions thrown during "Array to string conversion" error processing
Reduce over-specialization for quite seldom instructions
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 4c5a3e4ce7..dc04548757 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -870,7 +870,8 @@ try_again: } case IS_ARRAY: zend_error(E_NOTICE, "Array to string conversion"); - return ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED); + return (try && UNEXPECTED(EG(exception))) ? + NULL : ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED); case IS_OBJECT: { zval tmp; if (Z_OBJ_HT_P(op)->cast_object) { |