Support for exceptions thrown during "Array to string conversion" error processing

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 36606713961356ac1351ead1bd638107c512c354..a2da9d1fe3f47192b48b7c8322cae6a22243aea0 100644 (file)
--- 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) {