summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-12 17:59:36 +0000
committerZeev Suraski <zeev@php.net>1999-04-12 17:59:36 +0000
commitb06c5731fc2ac9ee11600096061e67b68a5b713e (patch)
treebadeca82880bf6fa03875817ffe34cee77553c25 /Zend
parent4213b5d6b6431d6f359330fcf474d975fa7b3ccf (diff)
downloadphp-git-b06c5731fc2ac9ee11600096061e67b68a5b713e.tar.gz
Minor fixes:
missing zval_copy_ctor() messed up AiCount fix
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_compile.c1
-rw-r--r--Zend/zend_execute.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 65ffdf30ea..f661beb308 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1438,6 +1438,7 @@ void do_list_end(znode *result, znode *expr CLS_DC)
le = CG(list_llist).head;
while (le) {
do_assign(result, &((list_llist_element *) le->data)->var, &((list_llist_element *) le->data)->value CLS_CC);
+ EG(active_op_array)->opcodes[EG(active_op_array)->last-1].result.u.EA.type |= EXT_TYPE_UNUSED;
le = le->next;
}
zend_llist_destroy(&CG(dimension_llist));
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 5683e93a8b..01b19c3c1d 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1453,6 +1453,7 @@ send_by_ref:
**varptr_ptr = *varptr;
varptr = *varptr_ptr;
varptr->refcount = 1;
+ zval_copy_ctor(varptr);
}
varptr->is_ref = 1;
/* at the end of this code refcount is always 1 */