diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:54:44 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-13 09:54:44 +0200 |
| commit | bdf3fa8c3e171c32635a6df0d5b544629eecb951 (patch) | |
| tree | f442ecc9951b2e6056600cdfda28d8bfbeb492ea | |
| parent | ce646357bf8f58f7fc52c5ce77c5b9a4e5c207fb (diff) | |
| parent | 7ba54b9822161283c6290c6ad9b7305594023cc3 (diff) | |
| download | php-git-bdf3fa8c3e171c32635a6df0d5b544629eecb951.tar.gz | |
Merge branch 'PHP-7.3' into 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 e3efb26ddc..eb76887a9d 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); } } |