diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 03:56:42 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 03:56:42 +0300 |
commit | 53d20140fbe4a5fa4339a7429280b4a964f5791d (patch) | |
tree | edcf7a29796363bedafce3c086f78ac869662340 /Zend/zend_operators.c | |
parent | ea09a9fa325fe21ebc81c41a63ab8c2f377d7f75 (diff) | |
download | php-git-53d20140fbe4a5fa4339a7429280b4a964f5791d.tar.gz |
Fixed performance degradation introduced with lateast EnfineException related changes.
Restore original errors order in executor.
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 3cfa0081a7..8ded1f2de9 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1544,7 +1544,7 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / size_t result_len = op1_len + op2_len; zend_string *result_str; - if (op1_len > SIZE_MAX - op2_len) { + if (UNEXPECTED(op1_len > SIZE_MAX - op2_len)) { zend_error(E_EXCEPTION | E_ERROR, "String size overflow"); ZVAL_FALSE(result); return FAILURE; |