BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-04 19:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 430cacdb44
commit 5f25ce9282
No known key found for this signature in database
GPG key ID: FA148B892AB48044
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,9 +250,6 @@ static int SetupWindowData(_THIS, SDL_Window *window, Window w, BOOL created)
{
SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
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));
@ -275,23 +272,14 @@ static int SetupWindowData(_THIS, SDL_Window *window, Window w, BOOL created)
/* Associate the data with the window */
if (numwindows < windowlistlength) {
windowlist[numwindows] = data;
videodata->numwindows++;
} else {
windowlist =
(SDL_WindowData **)SDL_realloc(windowlist,
(numwindows +
1) *
sizeof(*windowlist));
if (!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) {
SDL_OutOfMemory();
goto error_cleanup;
}
windowlist[numwindows] = data;
videodata->numwindows++;
videodata->windowlistlength++;
videodata->windowlist = windowlist;
videodata->windowlist = new_windowlist;
}
/* Fill in the SDL window with the window data */
@ -360,6 +348,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, Window w, BOOL created)
/* All done! */
window->driverdata = data;
videodata->windowlist[videodata->numwindows++] = data;
return 0;
error_cleanup: