zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: Fixed a memory leak when adding duplicate display modes.

This commit is contained in:
Ryan C. Gordon 2015-08-07 00:59:31 -04:00
parent fcc5940935
commit ca46804210
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video/x11/SDL_x11modes.c
View File

@ -748,7 +748,9 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
*modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata; *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
} }
mode.driverdata = modedata; mode.driverdata = modedata;
SDL_AddDisplayMode(sdl_display, &mode); if (!SDL_AddDisplayMode(sdl_display, &mode)) {
SDL_free(modedata);
}
} }
else if (!data->use_xrandr) else if (!data->use_xrandr)
{ {
@ -762,7 +764,9 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
*modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata; *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
} }
mode.driverdata = modedata; mode.driverdata = modedata;
SDL_AddDisplayMode(sdl_display, &mode); if (!SDL_AddDisplayMode(sdl_display, &mode)) {
SDL_free(modedata);
}
} }
} }
@ -787,9 +791,8 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
} }
mode.driverdata = modedata; mode.driverdata = modedata;
if (SetXRandRModeInfo(display, res, output_info, output_info->modes[i], &mode)) { if (!SetXRandRModeInfo(display, res, output_info, output_info->modes[i], &mode) ||
SDL_AddDisplayMode(sdl_display, &mode); !SDL_AddDisplayMode(sdl_display, &mode)) {
} else {
SDL_free(modedata); SDL_free(modedata);
} }
} }
@ -822,9 +825,7 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
} }
mode.driverdata = modedata; mode.driverdata = modedata;
if (SetXVidModeModeInfo(modes[i], &mode)) { if (!SetXVidModeModeInfo(modes[i], &mode) || !SDL_AddDisplayMode(sdl_display, &mode)) {
SDL_AddDisplayMode(sdl_display, &mode);
} else {
SDL_free(modedata); SDL_free(modedata);
} }
} }
@ -842,7 +843,9 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
*modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata; *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
} }
mode.driverdata = modedata; mode.driverdata = modedata;
SDL_AddDisplayMode(sdl_display, &mode); if (!SDL_AddDisplayMode(sdl_display, &mode)) {
SDL_free(modedata);
}
} }
} }