cvs: ZendEngine2 / zend_execute.c
| From: | Ilia Alshanetsky | Date: | Fri, 21 Nov 2003 04:45:43 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-1999@lists.php.net to get a copy of this message | ||
iliaa Thu Nov 20 23:45:43 2003 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
Cleaner patch for bug #26281.
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.550 ZendEngine2/zend_execute.c:1.551
--- ZendEngine2/zend_execute.c:1.550 Tue Nov 18 19:41:14 2003
+++ ZendEngine2/zend_execute.c Thu Nov 20 23:45:43 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.550 2003/11/19 00:41:14 iliaa Exp $ */
+/* $Id: zend_execute.c,v 1.551 2003/11/21 04:45:43 iliaa Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -194,15 +194,7 @@
switch (opline->op1.op_type) {
case IS_VAR:
if (!T(opline->op1.u.var).var.ptr_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);
-#ifdef ilia_0 /* attempts to free already freed data */
- zval_dtor(&T->tmp_var);
-#endif
+ zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
} else {
zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
if (opline->extended_value) { /* foreach() free */