mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Fix double free when deleting an output display

Browse Source
This commit is contained in:
Frank Praznik
2024-06-21 12:59:21 -04:00
parent 6589287ed6
commit 3b88d4f46f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/wayland/SDL_waylandvideo.c
View File

@@ -761,12 +761,11 @@ static void Wayland_free_display(SDL_VideoData *d, uint32_t id)
Wayland_RemoveOutputFromWindow(window->driverdata, data->output); Wayland_RemoveOutputFromWindow(window->driverdata, data->output);
} }
SDL_DelVideoDisplay(i);
if (data->xdg_output) { if (data->xdg_output) {
zxdg_output_v1_destroy(data->xdg_output); zxdg_output_v1_destroy(data->xdg_output);
} }
wl_output_destroy(data->output); wl_output_destroy(data->output);
SDL_free(data); SDL_DelVideoDisplay(i);
/* Update the index for all remaining displays */ /* Update the index for all remaining displays */
num_displays -= 1; num_displays -= 1;
@@ -1031,9 +1030,6 @@ static void Wayland_VideoCleanup(_THIS)
} }
wl_output_destroy(((SDL_WaylandOutputData *)display->driverdata)->output); wl_output_destroy(((SDL_WaylandOutputData *)display->driverdata)->output);
SDL_free(display->driverdata);
display->driverdata = NULL;
SDL_DelVideoDisplay(i); SDL_DelVideoDisplay(i);
} }
data->output_list = NULL; data->output_list = NULL;