mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-18 09:43:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #51822i (Segfault with strange __destruct() for static class variables)

Browse Source
This commit is contained in:
Dmitry Stogov 2010-06-10 11:45:51 +00:00
parent 7ea9e879f3
commit 743a2e29c1
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Zend/tests/bug51822.phpt Normal file
View File

@ -0,0 +1,40 @@
--TEST--
Bug #51822 (Segfault with strange __destruct() for static class variables)
--FILE--
<?php
class DestructableObject
{
public function __destruct()
{
echo "2\n";
}
}
class DestructorCreator
{
public function __destruct()
{
$this->test = new DestructableObject;
echo "1\n";
}
}
class Test
{
public static $mystatic;
}
// Uncomment this to avoid segfault
//Test::$mystatic = new DestructorCreator();
$x = new Test();
if (!isset(Test::$mystatic))
Test::$mystatic = new DestructorCreator();
echo "bla\n";
?>
--EXPECT--
bla
1
2

16
Zend/zend_opcode.c
View File

@ -166,7 +166,17 @@ ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)
/* Note that only run-time accessed data need to be cleaned up, pre-defined data can
not contain objects and thus are not probelmatic */
zend_hash_apply(&(*pce)->function_table, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC);
(*pce)->static_members_table = NULL;
if ((*pce)->static_members_table) {
int i;
for (i = 0; i < (*pce)->default_static_members_count; i++) {
if ((*pce)->static_members_table[i]) {
zval_ptr_dtor(&(*pce)->static_members_table[i]);
(*pce)->static_members_table[i] = NULL;
}
}
(*pce)->static_members_table = NULL;
}
} else if (CE_STATIC_MEMBERS(*pce)) {
int i;
@ -255,7 +265,9 @@ ZEND_API void destroy_zend_class(zend_class_entry **pce)
int i;
for (i = 0; i < ce->default_static_members_count; i++) {
zval_ptr_dtor(&ce->default_static_members_table[i]);
if (ce->default_static_members_table[i]) {
zval_ptr_dtor(&ce->default_static_members_table[i]);
}
}
efree(ce->default_static_members_table);
}