clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #39721 (Runtime inheritance causes data corruption)

Browse Source
This commit is contained in:
Dmitry Stogov 2006-12-05 19:03:51 +00:00
parent 5e7eed6a9a
commit 68890ce196
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -320,6 +320,7 @@ PHP NEWS
being applied when RAW filter is used. (Ilia)
- Fixed memory leaks in openssl streams context options. (Pierre)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
- Fixed bug #39721 (Runtime inheritance causes data corruption). (Dmitry)
- Fixed bug #39304 (Segmentation fault with list unpacking of string offset).
(Dmitry)
- Fixed bug #39192 (Not including nsapi.h properly with SJSWS 7). This will

30
Zend/tests/bug39721.phpt Executable file
View File

@ -0,0 +1,30 @@
--TEST--
Bug #39721 (Runtime inheritance causes data corruption)
--FILE--
<?php
class test2 {
private static $instances = 0;
public $instance;
public function __construct() {
$this->instance = ++self::$instances;
}
}
$foo = new test2();
if (is_object($foo)) {
class test2_child extends test2 {
}
}
$child = new test2_child();
echo $foo->instance . "\n";
echo $child->instance . "\n";
?>
--EXPECT--
1
2

19
Zend/zend_compile.c
View File

@ -2189,13 +2189,18 @@ ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, zend_class_entry
}
}
static void inherit_static_prop(zval **p)
static int inherit_static_prop(zval **p, int num_args, va_list args, zend_hash_key *key)
{
(*p)->refcount++;
(*p)->is_ref = 1;
}
HashTable *target = va_arg(args, HashTable*);
if (!zend_hash_quick_exists(target, key->arKey, key->nKeyLength, key->h)) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(p);
if (zend_hash_quick_add(target, key->arKey, key->nKeyLength, key->h, p, sizeof(zval*), NULL) == SUCCESS) {
(*p)->refcount++;
}
}
return ZEND_HASH_APPLY_KEEP;
}
ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRMLS_DC)
{
@ -2216,9 +2221,9 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
if (parent_ce->type != ce->type) {
/* User class extends internal class */
zend_update_class_constants(parent_ce TSRMLS_CC);
zend_hash_merge(&ce->default_static_members, CE_STATIC_MEMBERS(parent_ce), (void (*)(void *)) inherit_static_prop, NULL, sizeof(zval *), 0);
zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce), (apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members);
} else {
zend_hash_merge(&ce->default_static_members, &parent_ce->default_static_members, (void (*)(void *)) inherit_static_prop, NULL, sizeof(zval *), 0);
zend_hash_apply_with_arguments(&parent_ce->default_static_members, (apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members TSRMLS_CC);
}
zend_hash_merge_ex(&ce->properties_info, &parent_ce->properties_info, (copy_ctor_func_t) (ce->type & ZEND_INTERNAL_CLASS ? zend_duplicate_property_info_internal : zend_duplicate_property_info), sizeof(zend_property_info), (merge_checker_func_t) do_inherit_property_access_check, ce);