Fixed: Possible crash when copying an entity with entities attached t…

…o it
richardbiely · Dec 12, 2023 · 12757c7 · 12757c7
1 parent 59b6a11
commit 12757c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/include/gaia/ecs/chunk.h b/include/gaia/ecs/chunk.h
@@ -905,7 +905,7 @@ namespace gaia {
 					const auto& rec = recs[i];
 
 					const auto* pDesc = rec.pDesc;
-					if (pDesc->func_ctor == nullptr)
+					if (pDesc == nullptr || pDesc->func_ctor == nullptr)
 						continue;
 
 					auto* pSrc = (void*)comp_ptr_mut(i, entIdx);

diff --git a/single_include/gaia.h b/single_include/gaia.h
@@ -16715,7 +16715,7 @@ namespace gaia {
 					const auto& rec = recs[i];
 
 					const auto* pDesc = rec.pDesc;
-					if (pDesc->func_ctor == nullptr)
+					if (pDesc == nullptr || pDesc->func_ctor == nullptr)
 						continue;
 
 					auto* pSrc = (void*)comp_ptr_mut(i, entIdx);

diff --git a/src/test/src/main.cpp b/src/test/src/main.cpp
@@ -3393,6 +3393,17 @@ TEST_CASE("Usage 1 - simple query, 0 component") {
 	}
 }
 
+TEST_CASE("entity copy") {
+	ecs::World w;
+
+	auto e1 = w.add();
+	auto e2 = w.add();
+	w.add(e1, e2);
+	auto e3 = w.copy(e1);
+
+	REQUIRE(w.has(e3, e2));
+}
+
 TEST_CASE("Usage 1 - simple query, 1 component") {
 	ecs::World w;