Fix nullpointer deref

StarGate01 · Nov 19, 2021 · c6caff2 · c6caff2
1 parent 13d6ad0
commit c6caff2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUMInjector/AUMInjector.vcxproj b/AUMInjector/AUMInjector.vcxproj
@@ -181,7 +181,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>DEV_TOOLS;IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT;IMGUI_IMPL_WIN32_DISABLE_GAMEPAD;WIN32;_DEBUG;AUMINJECTOR_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT;IMGUI_IMPL_WIN32_DISABLE_GAMEPAD;WIN32;_DEBUG;AUMINJECTOR_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

diff --git a/AUMInjector/user/main.cpp b/AUMInjector/user/main.cpp
@@ -75,7 +75,8 @@ void PlayerControl_FixedUpdate_Hook(PlayerControl* __this, MethodInfo* method)
         // From Player Control, get the Player Data
         PlayerInfo* Data = PlayerControl_GetData_Trampoline(__this, NULL);
         // And now we can get if we are imposter.
-        bool isImposter = (int32_t)Data->fields.Role->fields.TeamType & (int32_t)RoleTeamTypes__Enum::Impostor;
+        RoleBehaviour* role = Data->fields.Role;
+        bool isImposter = role != nullptr && ((int32_t)role->fields.TeamType & (int32_t)RoleTeamTypes__Enum::Impostor) != 0;
         mumblePlayer.SetImposter(isImposter);
 
         // Set if player is using radio