diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 16:48:15 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 16:48:15 +0300 |
| commit | 780a8123fe11ef255b264b18b3482cc1a0810d61 (patch) | |
| tree | 3259762c08b323525eb2663a3ebc0fcaf110c4f7 /Zend/zend_operators.c | |
| parent | 0cad725886dc620632f3aa413c1e944411465cd0 (diff) | |
| download | php-git-780a8123fe11ef255b264b18b3482cc1a0810d61.tar.gz | |
Convert fatal errors into EngineExceptions
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index daa3ada6ed..7a06fdb04c 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1545,7 +1545,9 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / zend_string *result_str; if (op1_len > SIZE_MAX - op2_len) { - zend_error_noreturn(E_ERROR, "String size overflow"); + zend_error(E_EXCEPTION | E_ERROR, "String size overflow"); + ZVAL_FALSE(result); + return; } if (result == op1 && Z_REFCOUNTED_P(result)) { |