diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:30:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:30:41 +0800 |
| commit | 62c1c11ad34103729988df9edea343337a900ba9 (patch) | |
| tree | 263896376fcc2ab28a5c1dcb34839a2a09b1e40e /Zend/zend_inheritance.c | |
| parent | dcf3db6ac86d5a2fb58cd337b691de820c160c3f (diff) | |
| download | php-git-62c1c11ad34103729988df9edea343337a900ba9.tar.gz | |
Fixed bug #71413 (Crash with constants on internal interfaces)
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index c4b22849dd..2226f6013d 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -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); } } /* }}} */ |