From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 17 Sep 2008 13:10:08 +0000 (+0000)
Subject: Fixed possible crash because of overriden error handler
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d083b068ce45cfa1967dacbc7e1623a8ca7909d4;p=php

Fixed possible crash because of overriden error handler
---

diff --git a/Zend/tests/closure_031.phpt b/Zend/tests/closure_031.phpt
new file mode 100644
index 0000000000..dace4a4e73
--- /dev/null
+++ b/Zend/tests/closure_031.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Closure 031: Closure properties with custom error handlers
+--FILE--
+<?php
+function foo($errno, $errstr, $errfile, $errline) {
+	echo "Error: $errstr\n";
+}
+set_error_handler('foo');
+$foo = function() {
+};
+var_dump($foo->a);
+?>
+--EXPECT--
+Error: Closure object cannot have properties
+NULL
+
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index d4a80719bb..7ada6274c0 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -140,7 +140,8 @@ static zend_function *zend_closure_get_method(zval **object_ptr, zstr method_nam
 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);
 }
 /* }}} */