Merge Validate app domain before removing ref (pr-2861)

7f1be62 - fix(scripting/mono-v2): validate app domain before removing ref
citizenfx · Oct 31, 2024 · bcfe47f · bcfe47f
2 parents 24c6b8f + 7f1be62
commit bcfe47f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp b/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp
@@ -379,6 +379,12 @@ result_t MonoScriptRuntime::RemoveRef(int32_t refIndex)
 {
 	fx::PushEnvironment env(this);
 	MonoComponentHost::EnsureThreadAttached();
+
+	if (m_appDomain == nullptr)
+	{
+		return FX_E_INVALIDARG;
+	}
+
 	MonoDomainScope scope(m_appDomain);
 
 	MonoException* exc = nullptr;