diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:57 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:57 +0800 |
| commit | bad56393866eea019e96efca12914d2ea7d7ceeb (patch) | |
| tree | 77508fcb6a21822227012e59c4c0b2e0147793d3 /Zend/zend_operators.c | |
| parent | 76b2b4a190c8a5ab264df36cf1ccdb9ddd3686ad (diff) | |
| parent | 634f79d8d85743a4b214f6dd70f7f78d214f7159 (diff) | |
| download | php-git-bad56393866eea019e96efca12914d2ea7d7ceeb.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Compiler warning
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 ffc4dcc9a2..2054bbcee7 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -225,8 +225,10 @@ ZEND_API void ZEND_FASTCALL convert_scalar_to_number(zval *op) /* {{{ */ if (Z_TYPE(holder) == IS_LONG) { \ if (op == result) { \ zval_ptr_dtor(op); \ + ZVAL_LONG(op, Z_LVAL(holder)); \ + } else { \ + (op) = &(holder); \ } \ - (op) = &(holder); \ } \ break; \ } \ |