Fix crash issue due to args.GetCondArgObjHndl without checking handle…

… validity
GrognardsFromHell · Jul 11, 2020 · a3361c4 · a3361c4
1 parent 24b6a13
commit a3361c4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/TemplePlus/dispatcher.cpp b/TemplePlus/dispatcher.cpp
@@ -1388,6 +1388,8 @@ int32_t DispatcherCallbackArgs::GetCondArg(uint32_t argIdx)
 objHndl DispatcherCallbackArgs::GetCondArgObjHndl(uint32_t argIdx)
 {
 	objHndl handle { ((((uint64_t)GetCondArg(argIdx)) << 32) | GetCondArg(argIdx + 1)) };
+	if (!gameSystems->GetObj().IsValidHandle(handle))
+		handle = objHndl::null;
 	return handle;
 }