diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:55:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:55:06 +0200 |
| commit | d996a8c41005b85733ad04d274bb61a9ddf8b182 (patch) | |
| tree | 687ef57cac97358229cc9a1a0412630063ebca0f | |
| parent | 06aa2ae993df2b6e086c04fbc4f1ab2784350105 (diff) | |
| parent | bdf3fa8c3e171c32635a6df0d5b544629eecb951 (diff) | |
| download | php-git-d996a8c41005b85733ad04d274bb61a9ddf8b182.tar.gz | |
Merge branch 'PHP-7.4'
| -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 fca24d209d..fb1a94f747 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -49,7 +49,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); } } |