Skip to content

bugfix(gui): Prevent null pointer dereference in GadgetPushButton message sending #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 1 commit into from
May 7, 2026
+62 −44
Merged

bugfix(gui): Prevent null pointer dereference in GadgetPushButton message sending #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
{
BitSet( instData->m_state, WIN_STATE_HILITED );

TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_ENTERING,
(WindowMsgData)window,
mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_ENTERING,
(WindowMsgData)window,
mData1 );

//TheWindowManager->winSetFocus( window );
}
Expand All @@ -110,10 +111,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
{
BitClear( instData->m_state, WIN_STATE_HILITED );
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_LEAVING,
(WindowMsgData)window,
mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_LEAVING,
(WindowMsgData)window,
mData1 );
}

//
Expand All @@ -137,8 +139,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
case GWM_LEFT_DRAG:
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GGM_LEFT_DRAG,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GGM_LEFT_DRAG,
(WindowMsgData)window, mData1 );
break;

}
Expand Down Expand Up @@ -171,8 +174,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
else
BitSet( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );

}
else
Expand Down Expand Up @@ -200,8 +204,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,

BitClear( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );

}
else
Expand Down Expand Up @@ -248,8 +253,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
else
BitSet( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );

}
else
Expand Down Expand Up @@ -284,8 +290,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );

BitClear( instData->m_state, WIN_STATE_SELECTED );

Expand Down Expand Up @@ -330,8 +337,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, 0 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, 0 );

BitClear( instData->m_state, WIN_STATE_SELECTED );

Expand All @@ -354,8 +362,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
else
BitSet( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );

}
else
Expand Down
53 changes: 31 additions & 22 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
{
BitSet( instData->m_state, WIN_STATE_HILITED );

TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_ENTERING,
(WindowMsgData)window,
mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_ENTERING,
(WindowMsgData)window,
mData1 );

//TheWindowManager->winSetFocus( window );
}
Expand All @@ -122,10 +123,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
{
BitClear( instData->m_state, WIN_STATE_HILITED );
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_LEAVING,
(WindowMsgData)window,
mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(),
GBM_MOUSE_LEAVING,
(WindowMsgData)window,
mData1 );
}

//
Expand All @@ -149,8 +151,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
case GWM_LEFT_DRAG:
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GGM_LEFT_DRAG,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GGM_LEFT_DRAG,
(WindowMsgData)window, mData1 );
break;

}
Expand Down Expand Up @@ -194,8 +197,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
}

if (buttonTriggersOnMouseDown(window)) {
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
}

break;
Expand All @@ -217,8 +221,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,

if (!buttonTriggersOnMouseDown(window)) {
// If it didn't trigger on mouse down, trigger on the mouse up. jba [8/6/2003]
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
}

}
Expand Down Expand Up @@ -266,8 +271,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
else
BitSet( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );

}
else
Expand Down Expand Up @@ -302,8 +308,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
(WindowMsgData)window, mData1 );

BitClear( instData->m_state, WIN_STATE_SELECTED );

Expand Down Expand Up @@ -348,8 +355,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
{

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, 0 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, 0 );

BitClear( instData->m_state, WIN_STATE_SELECTED );

Expand All @@ -372,8 +380,9 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
else
BitSet( instData->m_state, WIN_STATE_SELECTED );

TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );
if( instData->getOwner() != nullptr )
TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
(WindowMsgData)window, mData1 );

}
else
Expand Down
Loading