diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:54:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:54:26 +0200 |
| commit | 7ba54b9822161283c6290c6ad9b7305594023cc3 (patch) | |
| tree | 37ea758b456bbceff15fc2dc4e9f13c8d11c66c6 | |
| parent | 4cd563d07e388922f0469a820c1c0c34e5060ab4 (diff) | |
| parent | 18f2918a0fcf66562a5e7d964188c188660e9728 (diff) | |
| download | php-git-7ba54b9822161283c6290c6ad9b7305594023cc3.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | Zend/zend_objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 6f44ee22a1..b0a50df113 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -43,7 +43,8 @@ ZEND_API void zend_object_std_dtor(zend_object *object) if (object->properties) { if (EXPECTED(!(GC_FLAGS(object->properties) & IS_ARRAY_IMMUTABLE))) { - if (EXPECTED(GC_DELREF(object->properties) == 0)) { + if (EXPECTED(GC_DELREF(object->properties) == 0) + && EXPECTED(GC_TYPE(object->properties) != IS_NULL)) { zend_array_destroy(object->properties); } } |