summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-09-24 17:24:11 +0800
committerXinchen Hui <laruence@gmail.com>2017-09-24 17:24:11 +0800
commitb05ff14a9aa8fd98eea9cbeb090f9d64bf302561 (patch)
tree3ebfa1245261cf46bcaa169cba48864ae2f33988 /Zend/zend_operators.c
parentdb63367871ce475d52ae8a3c9cc8efe5bc908dec (diff)
downloadphp-git-b05ff14a9aa8fd98eea9cbeb090f9d64bf302561.tar.gz
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 3a8929b83f..d87dba919b 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -221,8 +221,10 @@ try_again:
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; \
} \