diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 14:09:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 14:09:42 +0300 |
| commit | be74ca497680ef544af1f650fe4717a3e0d0af67 (patch) | |
| tree | f4599943c6a725f804a74a1de9ecb53a9f072b8d /Zend/zend_operators.c | |
| parent | a95014dc101756d93696c5c283578302a8334edd (diff) | |
| download | php-git-be74ca497680ef544af1f650fe4717a3e0d0af67.tar.gz | |
Support for exceptions thrown during "Array to string conversion" error processing
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 3660671396..a2da9d1fe3 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -887,7 +887,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) { |