From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 13 Aug 2019 07:54:26 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.9RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ba54b9822161283c6290c6ad9b7305594023cc3;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

7ba54b9822161283c6290c6ad9b7305594023cc3
diff --cc Zend/zend_objects.c
index 6f44ee22a1,7a93c1bdb1..b0a50df113
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@@ -43,7 -46,8 +43,8 @@@ ZEND_API void zend_object_std_dtor(zend
  
  	if (object->properties) {
  		if (EXPECTED(!(GC_FLAGS(object->properties) & IS_ARRAY_IMMUTABLE))) {
- 			if (EXPECTED(GC_DELREF(object->properties) == 0)) {
 -			if (EXPECTED(--GC_REFCOUNT(object->properties) == 0)
++			if (EXPECTED(GC_DELREF(object->properties) == 0)
+ 					&& EXPECTED(GC_TYPE(object->properties) != IS_NULL)) {
  				zend_array_destroy(object->properties);
  			}
  		}