Skip to content

[SDL2] Haiku: fix modelist double-free #14779

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
icculus merged 2 commits into from
Jan 7, 2026
Merged

[SDL2] Haiku: fix modelist double-free #14779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b579883
haiku: fix modelist double-free
erysdren Jan 7, 2026
7a92a33
haiku: update modelist logic
erysdren Jan 7, 2026
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
21 changes: 12 additions & 9 deletions src/video/haiku/SDL_bmodes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,17 +244,20 @@ void HAIKU_GetDisplayModes(_THIS, SDL_VideoDisplay *display) {
uint32 count, i;

/* Get graphics-hardware supported modes */
bscreen.GetModeList(&bmodes, &count);
bscreen.GetMode(&this_bmode);

for (i = 0; i < count; ++i) {
// FIXME: Apparently there are errors with colorspace changes
if (bmodes[i].space == this_bmode.space) {
_BDisplayModeToSdlDisplayMode(&bmodes[i], &mode);
SDL_AddDisplayMode(display, &mode);
if (bscreen.GetModeList(&bmodes, &count) == B_OK)
{
if (bscreen.GetMode(&this_bmode) == B_OK)
{
for (i = 0; i < count; ++i) {
// FIXME: Apparently there are errors with colorspace changes
if (bmodes[i].space == this_bmode.space) {
_BDisplayModeToSdlDisplayMode(&bmodes[i], &mode);
SDL_AddDisplayMode(display, &mode);
}
}
}
free(bmodes); /* This should not be SDL_free() */
}
free(bmodes); /* This should not be SDL_free() */
}


Expand Down
Loading