diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:23 +0800 |
| commit | e8c200515a8014a24c98a92c7de7c33463114863 (patch) | |
| tree | 43c6884e80c80ccd897600bd31e4decda5a9ec55 /Zend/zend_operators.c | |
| parent | 628c257f713224663567a35b3da781153829a413 (diff) | |
| parent | b05ff14a9aa8fd98eea9cbeb090f9d64bf302561 (diff) | |
| download | php-git-e8c200515a8014a24c98a92c7de7c33463114863.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 418d2f03ea..8faf6924cf 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -222,8 +222,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; \ } \ |