com php-src: Fixed bug #64720 (SegFault on zend_deactivate) : NEWS Zend/tests/bug64720.phpt Zend/zend _object_handlers.c Zend/zend_opcode.c
| From: | Dmitry Stogov | Date: | Tue, 21 May 2013 05:58:11 +0000 |
| Subject: | com php-src: Fixed bug #64720 (SegFault on zend_deactivate) : NEWS Zend/tests/bug64720.phpt Zend/zend _object_handlers.c Zend/zend_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72211@lists.php.net to get a copy of this message | ||
Commit: 77fffff15762137e2d8173df9b733b4cb70fc996
Author: Dmitry Stogov <dmitry@zend.com> Tue, 21 May 2013 09:58:11 +0400
Parents: 1124b0678f9e60384736c7c1a0d1e84c633a5e7a
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=77fffff15762137e2d8173df9b733b4cb70fc996
Log:
Fixed bug #64720 (SegFault on zend_deactivate)
Bugs:
https://bugs.php.net/64720
Changed paths:
M NEWS
A Zend/tests/bug64720.phpt
M Zend/zend_object_handlers.c
M Zend/zend_opcode.c
Diff:
diff --git a/NEWS b/NEWS
index 9910c7c..5bf6872 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP NEWS
?? ??? 2013, PHP 5.4.16
- Core:
+ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
. Fixed bug #64729 (compilation failure on x32). (Gustavo)
. Fixed bug #64660 (Segfault on memory exhaustion within function definition).
(Stas, reported by Juha Kylmänen)
diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt
new file mode 100644
index 0000000..6c33165
--- /dev/null
+++ b/Zend/tests/bug64720.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #64720 (SegFault on zend_deactivate)
+--FILE--
+<?php
+class Stat {
+ private static $requests;
+ public static function getInstance() {
+ if (!isset(self::$requests[1])) {
+ self::$requests[1] = new self();
+ }
+ return self::$requests[1];
+ }
+
+ public function __destruct() {
+ unset(self::$requests[1]);
+ }
+}
+
+class Foo {
+ public function __construct() {
+ Stat::getInstance();
+ }
+}
+
+class Error {
+ private $trace;
+ public function __construct() {
+ $this->trace = debug_backtrace(1);
+ }
+}
+
+class Bar {
+ public function __destruct() {
+ Stat::getInstance();
+ new Error();
+ }
+
+ public function test() {
+ new Error();
+ }
+}
+
+$foo = new Foo();
+$bar = new Bar();
+$bar->test();
+?>
+--EXPECTF--
+Fatal error: Access to undeclared static property: Stat::$requests in %sbug64720.php on line 12
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cc45d35..c2bb056 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1278,6 +1278,14 @@ ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char
*p
}
}
+ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL) ||
+ UNEXPECTED(CE_STATIC_MEMBERS(ce)[property_info->offset] == NULL)) {
+ if (!silent) {
+ zend_error_noreturn(E_ERROR, "Access to undeclared static property: %s::$%s",
ce->name, property_name);
+ }
+ return NULL;
+ }
+
return &CE_STATIC_MEMBERS(ce)[property_info->offset];
}
/* }}} */
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index e673f01..695b651 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -162,8 +162,9 @@ static inline void cleanup_user_class_data(zend_class_entry *ce TSRMLS_DC)
for (i = 0; i < ce->default_static_members_count; i++) {
if (ce->static_members_table[i]) {
- zval_ptr_dtor(&ce->static_members_table[i]);
+ zval *p = ce->static_members_table[i];
ce->static_members_table[i] = NULL;
+ zval_ptr_dtor(&p);
}
}
ce->static_members_table = NULL;