diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 14:30:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 14:32:49 +0200 |
| commit | ad3ddf46f9f5c97c43f04612bb448fcd109e2926 (patch) | |
| tree | 1342fb5d2fb902757c62258d40c07e03be909d5d | |
| parent | d1de1777e9fcc2aa641f321aaf7b0fc9f7773e38 (diff) | |
| download | php-git-ad3ddf46f9f5c97c43f04612bb448fcd109e2926.tar.gz | |
Fixed bug #78644
Make sure the initialize the result of FETCH_OBJ_UNSET operations.
I'm using a NULL value rather than ERROR here, because the latter
no longer exists in master.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/bug78644.phpt | 16 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 1 |
3 files changed, 19 insertions, 0 deletions
@@ -8,6 +8,8 @@ PHP NEWS . Fixed bug #78620 (Out of memory error). (cmb, Nikita) . Fixed bug #78632 (method_exists() in php74 works differently from php73 in checking priv. methods). (Nikita) + . Fixed bug #78644 (SEGFAULT in ZEND_UNSET_OBJ_SPEC_VAR_CONST_HANDLER). + (Nikita) - Iconv: . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas, diff --git a/Zend/tests/bug78644.phpt b/Zend/tests/bug78644.phpt new file mode 100644 index 0000000000..3889e9fb05 --- /dev/null +++ b/Zend/tests/bug78644.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #78644: SEGFAULT in ZEND_UNSET_OBJ_SPEC_VAR_CONST_HANDLER +--FILE-- +<?php + +$a = new stdClass; +unset($a->b->c->d); +unset($a->b->c['d']); +var_dump($a); + +?> +--EXPECT-- +object(stdClass)#1 (1) { + ["b"]=> + NULL +} diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 42822785cb..15f3ee792a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2765,6 +2765,7 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c /* this should modify object only if it's empty */ if (type == BP_VAR_UNSET) { + ZVAL_NULL(result); return; } |