Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit 7ba54b982216 · 2019-08-13T09:54:26.000+02:00
diff --git 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);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ ZEND_API void zend_object_std_dtor(zend_object *object)`
`43`	`43`
`44`	`44`	`if (object->properties) {`
`45`	`45`	`if (EXPECTED(!(GC_FLAGS(object->properties) & IS_ARRAY_IMMUTABLE))) {`
`46`		`- if (EXPECTED(GC_DELREF(object->properties) == 0)) {`
	`46`	`+ if (EXPECTED(GC_DELREF(object->properties) == 0)`
	`47`	`+ && EXPECTED(GC_TYPE(object->properties) != IS_NULL)) {`
`47`	`48`	`zend_array_destroy(object->properties);`
`48`	`49`	`}`
`49`	`50`	`}`