diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-02 17:03:59 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-02 17:03:59 +0100 |
| commit | 91d365f80524b0b9ad1702736fea7dc67dd64277 (patch) | |
| tree | 9a5eff97ce63e0999b954c40c29c868021436d20 /Zend/zend_operators.c | |
| parent | 7b5e89de8214c85cf5af96fe43d00b5e87f87048 (diff) | |
| parent | 8f7325fc244995ae9f7acc2ef788aae31a46cc81 (diff) | |
| download | php-git-91d365f80524b0b9ad1702736fea7dc67dd64277.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
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 7eab1918b0..35c97fc027 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1600,10 +1600,10 @@ ZEND_API int ZEND_FASTCALL shift_right_function(zval *result, zval *op1, zval *o /* prevent wrapping quirkiness on some processors where >> 64 + x == >> x */ if (UNEXPECTED((zend_ulong)op2_lval >= SIZEOF_ZEND_LONG * 8)) { if (EXPECTED(op2_lval > 0)) { - ZVAL_LONG(result, (op1_lval < 0) ? -1 : 0); if (op1 == result) { zval_dtor(result); } + ZVAL_LONG(result, (op1_lval < 0) ? -1 : 0); return SUCCESS; } else { if (EG(current_execute_data) && !CG(in_compilation)) { |