Fix possible null pointer dereference

danielkrupinski · Sep 14, 2024 · 63e3992 · 63e3992
1 parent 070c270
commit 63e3992
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Source/GameClasses/ClientPanel.h b/Source/GameClasses/ClientPanel.h
@@ -15,7 +15,7 @@ struct ClientPanel {
 
     [[nodiscard]] decltype(auto) uiPanel() const noexcept
     {
-        return hookContext.template make<PanoramaUiPanel>(panel->uiPanel);
+        return hookContext.template make<PanoramaUiPanel>(uiPanelPointer());
     }
 
     template <template <typename> typename T>
@@ -25,6 +25,13 @@ struct ClientPanel {
     }
 
 private:
+    [[nodiscard]] cs2::CUIPanel* uiPanelPointer() const noexcept
+    {
+        if (panel)
+            return panel->uiPanel;
+        return nullptr;
+    }
+
     HookContext& hookContext;
     cs2::CPanel2D* panel;
 };
diff --git a/Source/GameClasses/PanoramaUiPanelContext.h b/Source/GameClasses/PanoramaUiPanelContext.h
@@ -18,7 +18,7 @@ struct PanoramaUiPanelContext {
 
     [[nodiscard]] decltype(auto) clientPanel() const noexcept
     {
-        return hookContext.template make<ClientPanel>(panel->clientPanel);
+        return hookContext.template make<ClientPanel>(clientPanelPointer());
     }
 
     template <template <typename> typename T>
@@ -124,6 +124,13 @@ struct PanoramaUiPanelContext {
     }
 
 private:
+    [[nodiscard]] cs2::CPanel2D* clientPanelPointer() const noexcept
+    {
+        if (panel)
+            return panel->clientPanel;
+        return nullptr;
+    }
+
     [[nodiscard]] cs2::CPanelStyle* getStyle() const noexcept
     {
         return impl().panelStyle.of(panel).get();