[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_closures.c

[Felipe Pena]

felipe   Sun, 08 Aug 2010 15:06:14 +

Revision: http://svn.php.net/viewvc?view=revision&revision=301990

Log:
- Fixed bug #52539 (Calling function from rebound Closure causes crash)

Bug: http://bugs.php.net/52539 (Assigned) Calling function from rebound Closure 
causes crash
  
Changed paths:
U   php/php-src/trunk/Zend/zend_closures.c

Modified: php/php-src/trunk/Zend/zend_closures.c
===
--- php/php-src/trunk/Zend/zend_closures.c  2010-08-08 14:48:24 UTC (rev 
301989)
+++ php/php-src/trunk/Zend/zend_closures.c  2010-08-08 15:06:14 UTC (rev 
301990)
@@ -416,6 +416,7 @@
zend_hash_init(closure->func.op_array.static_variables, 
zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0);
zend_hash_apply_with_arguments(static_variables 
TSRMLS_CC, (apply_func_args_t)zval_copy_static_var, 1, 
closure->func.op_array.static_variables);
}
+   closure->func.op_array.run_time_cache = NULL;
(*closure->func.op_array.refcount)++;
} else {
/* verify that we aren't binding internal function to a wrong 
scope */

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

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_closures.c

[Antony Dovgal]

tony2001 Tue, 20 Apr 2010 12:53:43 +

Revision: http://svn.php.net/viewvc?view=revision&revision=298216

Log:
fix ZTS build

Changed paths:
U   php/php-src/trunk/Zend/zend_closures.c

Modified: php/php-src/trunk/Zend/zend_closures.c
===
--- php/php-src/trunk/Zend/zend_closures.c  2010-04-20 12:50:02 UTC (rev 
298215)
+++ php/php-src/trunk/Zend/zend_closures.c  2010-04-20 12:53:43 UTC (rev 
298216)
@@ -258,7 +258,7 @@
zend_closure *closure = (zend_closure 
*)zend_object_store_get_object(zobject TSRMLS_CC);
zval result;

-   zend_create_closure(&result, &closure->func, 
closure->func.common.scope, closure->this_ptr);
+   zend_create_closure(&result, &closure->func, 
closure->func.common.scope, closure->this_ptr TSRMLS_CC);
return Z_OBJVAL(result);
 }
 /* }}} */

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