summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2005-01-18 12:01:31 +0000
committerDmitry Stogov <dmitry@php.net>2005-01-18 12:01:31 +0000
commit57a0c3e1597d3f444027b8e68b655cfde8b8c7d1 (patch)
treedbe070871a3c631373e2cbc2fe3825b4b79d175d
parent05039431503ddc993a421385cb0e4482e77cd24f (diff)
downloadphp-git-57a0c3e1597d3f444027b8e68b655cfde8b8c7d1.tar.gz
Fixed patch for bug #31478 (SegFault/Memory Leak with empty())
-rw-r--r--Zend/zend_compile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index cad9f26fcd..466748b052 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3305,6 +3305,7 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
last_op->op1.u.constant.value.str.val = estrdup(CG(active_op_array)->vars[variable->u.var].name);
SET_UNUSED(last_op->op2);
last_op->op2.u.EA.type = ZEND_FETCH_LOCAL;
+ last_op->result.u.var = get_temporary_variable(CG(active_op_array));
} else {
last_op = &CG(active_op_array)->opcodes[get_next_op_number(CG(active_op_array))-1];
@@ -3321,7 +3322,6 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
}
}
last_op->result.op_type = IS_TMP_VAR;
- last_op->result.u.var = get_temporary_variable(CG(active_op_array));
last_op->extended_value = type;
*result = last_op->result;