cvs: Zend(PHP_4_4) / zend_execute.c

derick          Wed Sep 21 04:15:22 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /Zend       zend_execute.c 
  Log:
  - MFH: Moved the FREE_OP to after the execution of the included file, or eval
    statement so that it is safe to access this information in the overridden
    zend_execute() function, which is what Xdebug does.
  
  
http://cvs.php.net/diff.php/Zend/zend_execute.c?r1=1.316.2.49.2.10&r2=1.316.2.49.2.11&ty=u
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.316.2.49.2.10 Zend/zend_execute.c:1.316.2.49.2.11
--- Zend/zend_execute.c:1.316.2.49.2.10 Mon Sep 19 12:03:09 2005
+++ Zend/zend_execute.c Wed Sep 21 04:15:21 2005
@@ -2252,7 +2252,6 @@
                                        if (inc_filename==&tmp_inc_filename) {
                                                zval_dtor(&tmp_inc_filename);
                                        }
-                                       FREE_OP(EX(Ts), &EX(opline)->op1, 
EG(free_op1));
                                        
EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = 
&EX(Ts)[EX(opline)->result.u.var].var.ptr;
                                        if (new_op_array) {
                                                zend_class_entry *saved_ce;
@@ -2300,6 +2299,7 @@
                                                        
EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_BOOL;
                                                }
                                        }
+                                       FREE_OP(EX(Ts), &EX(opline)->op1, 
EG(free_op1));
                                        EG(return_value_ptr_ptr) = 
original_return_value;
                                }
                                NEXT_OPCODE();

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php