diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-02 09:03:48 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-02 09:03:48 +0800 |
| commit | f8461d4aa31ff12a513a0e0e4d19b160889f279e (patch) | |
| tree | 60ceccb15d58243e98a6eff45e4a506ce04dacb8 /Zend/zend_operators.c | |
| parent | ed43b7a5487c7ea245ae5b7ecd4f0a4f349e1b3b (diff) | |
| parent | 53d20140fbe4a5fa4339a7429280b4a964f5791d (diff) | |
| download | php-git-f8461d4aa31ff12a513a0e0e4d19b160889f279e.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 7a06fdb04c..8ded1f2de9 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1544,10 +1544,10 @@ 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; + return FAILURE; } if (result == op1 && Z_REFCOUNTED_P(result)) { |