com php-src: Fixed infinity recurion if we create closure on top of other closure.: Zend/zend_closures.c

From: Date: Thu, 08 Oct 2015 23:37:51 +0000
Subject: com php-src: Fixed infinity recurion if we create closure on top of other closure.: Zend/zend_closures.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89330@lists.php.net to get a copy of this message
Commit: 93748bf9ddf971e42917565e35e122af96be85a6 Author: Dmitry Stogov <dmitry@zend.com> Fri, 9 Oct 2015 02:37:51 +0300 Parents: 05bd331c6a86ba157785338b2512e217e40f3312 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=93748bf9ddf971e42917565e35e122af96be85a6 Log: Fixed infinity recurion if we create closure on top of other closure. Changed paths: M Zend/zend_closures.c Diff: diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index b035a4f..a394c91 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -564,7 +564,14 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent closure->func..common.prototype = (zend_function*)closure; closure->func.common.fn_flags |= ZEND_ACC_CLOSURE; /* wrap internal function handler to avoid memory leak */ - closure->orig_internal_handler = closure->func.internal_function.handler; + if (UNEXPECTED(closure->func.internal_function.handler == zend_closure_internal_handler)) { + /* avoid infinity recursion, by taking handler from nested closure */ + zend_closure *nested = (zend_closure*)((char*)func - XtOffsetOf(zend_closure, func)); + ZEND_ASSERT(nested->std.ce == zend_ce_closure); + closure->orig_internal_handler = nested->orig_internal_handler; + } else { + closure->orig_internal_handler = closure->func.internal_function.handler; + } closure->func.internal_function.handler = zend_closure_internal_handler; /* verify that we aren't binding internal function to a wrong scope */ if(func->common.scope != NULL) {

« previous php.cvs (#89330) next »