Fix: Possible dangling pointer in kf_JumpToResourceExtractor

Warzone2100 · Oct 11, 2023 · 9d15ce1 · 9d15ce1
1 parent 2339507
commit 9d15ce1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/keybind.cpp b/src/keybind.cpp
@@ -1653,6 +1653,14 @@ void	kf_JumpToResourceExtractor()
 
 }
 
+void keybindInformResourceExtractorRemoved(const STRUCTURE* psResourceExtractor)
+{
+	if (psOldRE == psResourceExtractor)
+	{
+		psOldRE = nullptr;
+	}
+}
+
 // --------------------------------------------------------------------------
 MappableFunction kf_JumpToUnits(const DROID_TYPE droidType)
 {

diff --git a/src/keybind.h b/src/keybind.h
@@ -202,4 +202,7 @@ void kf_ToggleSpecOverlays();
 void enableGodMode();
 
 void keybindShutdown();
+
+void keybindInformResourceExtractorRemoved(const STRUCTURE* psResourceExtractor);
+
 #endif // __INCLUDED_SRC_KEYBIND_H__
diff --git a/src/structure.cpp b/src/structure.cpp
@@ -79,6 +79,7 @@
 #include "scores.h"
 #include "gateway.h"
 #include "multistat.h"
+#include "keybind.h"
 
 #include "random.h"
 #include <functional>
@@ -4348,6 +4349,8 @@ bool removeStruct(STRUCTURE *psDel, bool bDestroy)
 	{
 		//tell associated Power Gen
 		releaseResExtractor(psDel);
+		//tell keybind that this is going away (to prevent dangling pointer in kf_JumpToResourceExtractor)
+		keybindInformResourceExtractorRemoved(psDel);
 	}
 
 	if (psDel->pStructureType->type == REF_POWER_GEN)