SDK: Fix undefined behavior in UGameViewportClient::Draw scan

praydog · Oct 24, 2023 · f07365c · f07365c
1 parent c8a194d
commit f07365c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/shared/sdk/UGameViewportClient.cpp b/shared/sdk/UGameViewportClient.cpp
@@ -6,13 +6,16 @@
 #include <utility/Scan.hpp>
 #include <utility/Module.hpp>
 
+#include <tracy/Tracy.hpp>
+
 #include "EngineModule.hpp"
 
 #include "UGameViewportClient.hpp"
 
 namespace sdk {
 std::optional<uintptr_t> UGameViewportClient::get_draw_function() {
     static auto result = []() -> std::optional<uintptr_t> {
+        ZoneScopedN("sdk::UGameViewportClient::get_draw_function static init");
         const auto engine_module = sdk::get_ue_module(L"Engine");
         const auto canvas_object_strings = utility::scan_strings(engine_module, L"CanvasObject", true);
 
@@ -84,7 +87,7 @@ std::optional<uintptr_t> UGameViewportClient::get_draw_function() {
                         }*/
 
                         if (ix.BranchInfo.IsBranch && !ix.BranchInfo.IsConditional) {
-                            if (auto resolved = utility::resolve_displacement(ip); *resolved == possible_function) {
+                            if (auto resolved = utility::resolve_displacement(ip); resolved.has_value() && *resolved == possible_function) {
                                 impossible_functions.insert(other_function);
                                 SPDLOG_INFO("Found possible function within function at {:x} (insn {:x})", (uintptr_t)other_function, ip);
                                 return utility::ExhaustionResult::BREAK;