mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #71413 (Crash with constants on internal interfaces)

Browse Source
This commit is contained in:
Xinchen Hui 2016-01-21 13:30:41 +08:00
parent dcf3db6ac8
commit 62c1c11ad3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zend/zend_inheritance.c
View File

@ -933,13 +933,20 @@ static zend_bool do_inherit_constant_check(HashTable *child_constants_table, zen
static void do_inherit_iface_constant(zend_string *name, zend_class_constant *c, zend_class_entry *ce, zend_class_entry *iface) /* {{{ */
{
if (do_inherit_constant_check(&ce->constants_table, c, name, iface)) {
zend_class_constant *ct;
if (Z_REFCOUNTED(c->value)) {
Z_ADDREF(c->value);
}
if (Z_CONSTANT(c->value)) {
ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
}
zend_hash_update_ptr(&ce->constants_table, name, c);
if (ce->type & ZEND_INTERNAL_CLASS) {
ct = pemalloc(sizeof(zend_class_constant), 1);
} else {
ct = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
}
memcpy(ct, c, sizeof(zend_class_constant));
zend_hash_update_ptr(&ce->constants_table, name, ct);
}
}
/* }}} */