cvs: ZendEngine2 / zend_execute.c
| From: | Ilia Alshanetsky | Date: | Sat, 29 Nov 2003 17:33:25 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2026@lists.php.net to get a copy of this message | ||
iliaa Sat Nov 29 12:33:25 2003 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
Restore original patch for bug #26281.
# Andi if you have a time & interest please see if perhaps a better
# solution can be implemented. Thanks.
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.553 ZendEngine2/zend_execute.c:1.554
--- ZendEngine2/zend_execute.c:1.553 Mon Nov 24 15:57:53 2003
+++ ZendEngine2/zend_execute.c Sat Nov 29 12:33:25 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.553 2003/11/24 20:57:53 helly Exp $ */
+/* $Id: zend_execute.c,v 1.554 2003/11/29 17:33:25 iliaa Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -194,7 +194,11 @@
switch (opline->op1.op_type) {
case IS_VAR:
if (!T(opline->op1.u.var).var.ptr_ptr) {
- zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
+ temp_variable *T = &T(opline->op1.u.var);
+ /* perform the equivalent of equivalent of a
+ * quick & silent get_zval_ptr, and FREE_OP
+ */
+ PZVAL_UNLOCK(T->EA.data.str_offset.str);
} else {
zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
if (opline->extended_value) { /* foreach() free */