diff options
| author | Xinchen Hui <laruence@php.net> | 2015-07-10 15:27:06 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-07-10 15:27:06 +0800 |
| commit | a3f05d640d73d61c1978446adb1217f40356d037 (patch) | |
| tree | eaa4480ed2ef1c223a434fcd41b3404f4589210c /Zend/zend_inheritance.c | |
| parent | ef1b588f6a39bcc2c0d5fad9f2094bb011aeaf0b (diff) | |
| download | php-git-a3f05d640d73d61c1978446adb1217f40356d037.tar.gz | |
Fixed Issue #1400 (double free static property)
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 64e7407f12..9b96a4a479 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -821,7 +821,13 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent do { dst--; src--; - ZVAL_MAKE_REF(src); + if (parent_ce->type == ZEND_INTERNAL_CLASS) { + if (!Z_ISREF_P(src)) { + ZVAL_NEW_PERSISTENT_REF(src, src); + } + } else { + ZVAL_MAKE_REF(src); + } ZVAL_COPY_VALUE(dst, src); Z_ADDREF_P(dst); if (Z_CONSTANT_P(Z_REFVAL_P(dst))) { |