BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-05 22:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

x11: SetupWindowData shouldn't add to videodata->windowlist until success.

Browse source 
Fixes #15676.

(cherry picked from commit 22fb9edd5c)
This commit is contained in:
Ryan C. Gordon 2026-05-27 11:43:57 -04:00
parent a21c31aea1
commit eee7164d9d
No known key found for this signature in database
GPG key ID: FA148B892AB48044
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/video/x11/SDL_x11window.c
View file

@ -374,9 +374,6 @@ static bool SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, Window w
SDL_VideoData *videodata = _this->internal;
SDL_DisplayData *displaydata = SDL_GetDisplayDriverDataForWindow(window);
SDL_WindowData *data;
int numwindows = videodata->numwindows;
int windowlistlength = videodata->windowlistlength;
SDL_WindowData **windowlist = videodata->windowlist;
// Allocate the window data
data = (SDL_WindowData *)SDL_calloc(1, sizeof(*data));
@ -392,19 +389,13 @@ static bool SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, Window w
// Associate the data with the window
if (numwindows < windowlistlength) {
windowlist[numwindows] = data;
videodata->numwindows++;
} else {
SDL_WindowData ** new_windowlist = (SDL_WindowData **)SDL_realloc(windowlist, (numwindows + 1) * sizeof(*windowlist));
if (videodata->numwindows >= videodata->windowlistlength) {
SDL_WindowData ** new_windowlist = (SDL_WindowData **)SDL_realloc(videodata->windowlist, (videodata->numwindows + 1) * sizeof(*videodata->windowlist));
if (!new_windowlist) {
goto error_cleanup;
}
windowlist = new_windowlist;
windowlist[numwindows] = data;
videodata->numwindows++;
videodata->windowlistlength++;
videodata->windowlist = windowlist;
videodata->windowlist = new_windowlist;
}
// Fill in the SDL window with the window data
@ -487,6 +478,7 @@ static bool SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, Window w
// All done!
window->internal = data;
videodata->windowlist[videodata->numwindows++] = data;
return true;
error_cleanup: