Repository navigation
fix(main): Guard TheMouse and TheGlobalData against null in WndProc - #670
Open
sentry[bot] wants to merge 1 commit into
Open
sentry[bot] wants to merge 1 commit into
sentry[bot] wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes null-pointer dereferences in the main Win32 window procedure (
WndProc) when Windows messages are pumped during early engine initialization or shutdown before subsystems have finished initializing.Changes:
GeneralsMD/Code/Main/WinMain.cppandGenerals/Code/Main/WinMain.cpp:WM_MOUSEMOVEwithTheMouse == nullptrin addition toTheWin32Mouse == nullptr, preventing null calls intoTheMouse->isCursorInside(),onCursorMovedInside(), andonCursorMovedOutside().WM_NCHITTESTandWM_SYSCOMMANDwithif (TheGlobalData && !TheGlobalData->m_windowed)instead of readingTheGlobalData->m_windowedunguarded.Related to Sentry issue CLIENT-58M (null dereference in
WndProcduringGameEngine::init).Fixes CLIENT-58M
@sentry <feedback>: Autofix iterates on these changes@sentry stop iterating: Autofix stops iterating on this runThis PR was automatically generated by Sentry. You can adjust this setting at any time.