cvs: ZendEngine2 / zend_execute.c

helly           Sat Feb 18 17:36:41 2006 UTC

  Modified files:              
    /ZendEngine2        zend_execute.c 
  Log:
  - Fix possible memory corruption/memleak issue with foreach and iterators
  - Fix warnings
  
  
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute.c?r1=1.733&r2=1.734&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.733 ZendEngine2/zend_execute.c:1.734
--- ZendEngine2/zend_execute.c:1.733    Sun Feb  5 23:26:55 2006
+++ ZendEngine2/zend_execute.c  Sat Feb 18 17:36:41 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.733 2006/02/05 23:26:55 helly Exp $ */
+/* $Id: zend_execute.c,v 1.734 2006/02/18 17:36:41 helly Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -388,7 +388,7 @@
                                PZVAL_UNLOCK_FREE(T->str_offset.str);
                        } else {
                                zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
-                               if (opline->extended_value) { /* foreach() free 
*/
+                               if (opline->extended_value & 
ZEND_FE_RESET_VARIABLE) { /* foreach() free */
                                        
zval_ptr_dtor(&T(opline->op1.u.var).var.ptr);
                                }
                        }
@@ -483,8 +483,8 @@
 
        cur_arg_info = &zf->common.arg_info[arg_num-1];
        fname = zf->common.function_name;
-       fsep = zf->common.scope ? "::" : EMPTY_STR;
-       fclass = zf->common.scope ? zf->common.scope->name : EMPTY_STR;
+       fsep = zf->common.scope ? "::" : (char*)EMPTY_STR;
+       fclass = zf->common.scope ? zf->common.scope->name : (char*)EMPTY_STR;
 
        if (cur_arg_info->class_name) {
                if (!arg) {

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