- fixed potential garbage collection of still referenced objects

Objects from dynamic array stored in items of array of structures were incorrectly treated as unreachable https://forum.zdoom.org/viewtopic.php?t=61354
ZDoom · Jul 28, 2018 · e9041c0 · e9041c0
1 parent 7e69cd8
commit e9041c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/scripting/types.cpp b/src/scripting/types.cpp
@@ -1748,6 +1748,23 @@ void PArray::SetPointer(void *base, unsigned offset, TArray<size_t> *special)
 	}
 }
 
+//==========================================================================
+//
+// PArray :: SetPointerArray
+//
+//==========================================================================
+
+void PArray::SetPointerArray(void *base, unsigned offset, TArray<size_t> *special)
+{
+	if (ElementType->isStruct())
+	{
+		for (unsigned int i = 0; i < ElementCount; ++i)
+		{
+			ElementType->SetPointerArray(base, offset + ElementSize * i, special);
+		}
+	}
+}
+
 //==========================================================================
 //
 // NewArray

diff --git a/src/scripting/types.h b/src/scripting/types.h
@@ -485,6 +485,7 @@ class PArray : public PCompoundType
 
 	void SetDefaultValue(void *base, unsigned offset, TArray<FTypeAndOffset> *special) override;
 	void SetPointer(void *base, unsigned offset, TArray<size_t> *special) override;
+	void SetPointerArray(void *base, unsigned offset, TArray<size_t> *ptrofs = NULL) override;
 };
 
 class PStaticArray : public PArray