cvs: ZendEngine2(PHP_5_3) / zend_closures.c /tests closure_031.phpt

dmitry		Wed Sep 17 13:08:54 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /ZendEngine2/tests	closure_031.phpt 

  Modified files:              
    /ZendEngine2	zend_closures.c 
  Log:
  Fixed possible crash because of overriden error handler
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_closures.c?r1=1.3.2.13&r2=1.3.2.14&diff_format=u
Index: ZendEngine2/zend_closures.c
diff -u ZendEngine2/zend_closures.c:1.3.2.13 ZendEngine2/zend_closures.c:1.3.2.14
--- ZendEngine2/zend_closures.c:1.3.2.13	Thu Aug 14 21:36:56 2008
+++ ZendEngine2/zend_closures.c	Wed Sep 17 13:08:53 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_closures.c,v 1.3.2.13 2008/08/14 21:36:56 colder Exp $ */
+/* $Id: zend_closures.c,v 1.3.2.14 2008/09/17 13:08:53 dmitry Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -136,7 +136,8 @@
 static zval *zend_closure_read_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */
 {
 	ZEND_CLOSURE_PROPERTY_ERROR();
-	return NULL;
+	Z_ADDREF(EG(uninitialized_zval));
+	return &EG(uninitialized_zval);
 }
 /* }}} */
 

http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/closure_031.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/closure_031.phpt
+++ ZendEngine2/tests/closure_031.phpt