Disallow ArrayObject

Author: iluuu1994

Zend/tests/weakrefs/weakmap_data_classes.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Nested WeakMap for same object key
+WeakMaps disallow data classes
 --FILE--
 <?php
 

ext/spl/spl_array.c

@@ -975,6 +975,12 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar
 					ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name));
 				return;
 			}
+			if (UNEXPECTED(Z_OBJCE_P(array)->ce_flags & ZEND_ACC_DATA_CLASS)) {
+				zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0,
+					"Data object of type %s is not compatible with %s",
+					ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name));
+				return;
+			}
 			zval_ptr_dtor(&intern->array);
 			ZVAL_COPY(&intern->array, array);
 		}

ext/spl/tests/ArrayObject_data_classes.phpt

@@ -0,0 +1,26 @@
+--TEST--
+SPL: ArrayObject disallow data classes
+--FILE--
+<?php
+
+data class DC {}
+
+$dc = new DC();
+
+try {
+    new ArrayObject($dc);
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    $ao = new ArrayObject([]);
+    $ao->exchangeArray($dc);
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Data object of type DC is not compatible with ArrayObject
+Data object of type DC is not compatible with ArrayObject