Skip to content

GadgetListBox: Add safety check and clear child window pointers #51

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
Oct 10, 2025
Merged

GadgetListBox: Add safety check and clear child window pointers #51

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
10 changes: 10 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
GameWindow *child;

sData = (SliderData *)list->slider->winGetUserData();

// Safety check: ensure slider data is valid before accessing it
if( sData == NULL )
return;

list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
// Take into account that there is a line-drawn outline surrounding listbox
sData->maxVal = list->totalHeight - ( list->displayHeight - TOTAL_OUTLINE_HEIGHT ) + 1;
Expand Down Expand Up @@ -1973,6 +1978,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
if( list->multiSelect )
delete[]( list->selections );

// Clear child window pointers to prevent dangling pointer access
list->slider = NULL;
list->upButton = NULL;
list->downButton = NULL;

delete (ListboxData *)window->winGetUserData();
window->winSetUserData( NULL );
list = NULL;
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
GameWindow *child;

sData = (SliderData *)list->slider->winGetUserData();

// Safety check: ensure slider data is valid before accessing it
if( sData == NULL )
return;

list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
// Take into account that there is a line-drawn outline surrounding listbox
sData->maxVal = list->totalHeight - ( list->displayHeight - TOTAL_OUTLINE_HEIGHT ) + 1;
Expand Down Expand Up @@ -1973,6 +1978,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
if( list->multiSelect )
delete[]( list->selections );

// Clear child window pointers to prevent dangling pointer access
list->slider = NULL;
list->upButton = NULL;
list->downButton = NULL;

delete (ListboxData *)window->winGetUserData();
window->winSetUserData( NULL );
list = NULL;
Expand Down
Loading