Added additional checks to "GetCVARs" function.

Lyall · Aug 9, 2024 · 2ca9622 · 2ca9622
1 parent 8fc90b8
commit 2ca9622
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -363,8 +363,14 @@ void GetCVARs()
 
         // Cache all console objects
         ConsoleObjects = Unreal::GetConsoleObjects(singletonAddr);
-        bCachedConsoleObjects = true;
-        spdlog::info("Console CVARs: Cached all console objects.");
+
+        if (ConsoleObjects.Num() != 0) {
+            bCachedConsoleObjects = true;
+            spdlog::info("Console CVARs: Cached all console objects.");
+        }
+        else {
+            spdlog::info("Console CVARs: ConsoleObjects TMap is not valid.");
+        }
     }
     else if (!ConsoleManagerSingletonScanResult) {
         spdlog::error("Console CVARs: Pattern scan failed.");

diff --git a/src/helper.hpp b/src/helper.hpp
@@ -126,7 +126,18 @@ namespace Unreal
 
     SDK::TMap<SDK::FString, FConsoleObject*> GetConsoleObjects(uintptr_t singletonAddr)
     {
+        if (singletonAddr == 0)
+        {
+            return SDK::TMap<SDK::FString, FConsoleObject*>();
+        }
+
         SDK::uint8** Singleton = reinterpret_cast<SDK::uint8**>(singletonAddr);
+
+        if (Singleton == nullptr || *Singleton == nullptr )
+        {
+            return SDK::TMap<SDK::FString, FConsoleObject*>();
+        }
+
         return *reinterpret_cast<SDK::TMap<SDK::FString, FConsoleObject*>*>(*Singleton + 8);
     }