]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 07:54:26 +0000 (09:54 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 07:54:26 +0000 (09:54 +0200)
1  2 
Zend/zend_objects.c

index 6f44ee22a11e593dd9abf545ee7cadab10efa787,7a93c1bdb182f0dfb9a7cb12ad574b2df9b9e350..b0a50df113d945fd8f208f6092b0b9e319d7ac78
@@@ -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);
                        }
                }