fix accessing obsolete memory in gui scrollbars in emit, after its co…

…rresponding entity has been removed (skip entire emit)
ucpu · Sep 25, 2023 · af7856c · af7856c
1 parent dc5bbaa
commit af7856c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/sources/libengine/gui/graphics.cpp b/sources/libengine/gui/graphics.cpp
@@ -210,6 +210,9 @@ namespace cage
 		if (!assetMgr->get<AssetSchemeIndexPack, AssetPack>(HashString("cage/cage.pack")))
 			return {};
 
+		if (!eventsEnabled)
+			return {}; // gui entities have been modified, invalidating any data cached in our hierarchy
+
 		GraphicsDataCleaner graphicsDataCleaner(this);
 
 		for (auto &s : skins)

diff --git a/sources/libengine/gui/layouts/scrollbars.cpp b/sources/libengine/gui/layouts/scrollbars.cpp
@@ -76,6 +76,7 @@ namespace cage
 
 			void emit() override
 			{
+				CAGE_ASSERT(data.scroll.valid());
 				hierarchy->childrenEmit();
 				for (uint32 a = 0; a < 2; a++)
 				{

diff --git a/sources/libengine/gui/tooltips.cpp b/sources/libengine/gui/tooltips.cpp
@@ -26,7 +26,7 @@ namespace cage
 			return nullptr;
 		}
 
-		// test of B is descendant of A
+		// test if B is descendant of A
 		bool isDescendantOf(const HierarchyItem *a, const HierarchyItem *b)
 		{
 			if (a == b)