mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-30 15:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak enumerating display modes on Windows

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/13233
This commit is contained in:
Sam Lantinga
2025-09-07 13:38:39 -07:00
parent 834b5ba7fb
commit 9116a56c13
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/windows/SDL_windowsmodes.c
View File

@@ -582,12 +582,12 @@ static void WIN_AddDisplay(SDL_VideoDevice *_this, HMONITOR hMonitor, const MONI
if (internal->state != DisplayRemoved) { if (internal->state != DisplayRemoved) {
// We've already enumerated this display, don't move it // We've already enumerated this display, don't move it
return; goto cleanup;
} }
if (index >= _this->num_displays) { if (index >= _this->num_displays) {
// This should never happen due to the check above, but just in case... // This should never happen due to the check above, but just in case...
return; goto cleanup;
} }
if (moved) { if (moved) {
@@ -608,6 +608,8 @@ static void WIN_AddDisplay(SDL_VideoDevice *_this, HMONITOR hMonitor, const MONI
SDL_ResetFullscreenDisplayModes(existing_display); SDL_ResetFullscreenDisplayModes(existing_display);
SDL_SetDesktopDisplayMode(existing_display, &mode); SDL_SetDesktopDisplayMode(existing_display, &mode);
// The mode is owned by the video subsystem
mode.internal = NULL;
if (WIN_GetDisplayBounds(_this, existing_display, &bounds) && if (WIN_GetDisplayBounds(_this, existing_display, &bounds) &&
SDL_memcmp(&internal->bounds, &bounds, sizeof(bounds)) != 0) { SDL_memcmp(&internal->bounds, &bounds, sizeof(bounds)) != 0) {
changed_bounds = true; changed_bounds = true;
@@ -630,7 +632,7 @@ static void WIN_AddDisplay(SDL_VideoDevice *_this, HMONITOR hMonitor, const MONI
displaydata = (SDL_DisplayData *)SDL_calloc(1, sizeof(*displaydata)); displaydata = (SDL_DisplayData *)SDL_calloc(1, sizeof(*displaydata));
if (!displaydata) { if (!displaydata) {
return; goto cleanup;
} }
SDL_memcpy(displaydata->DeviceName, info->szDevice, sizeof(displaydata->DeviceName)); SDL_memcpy(displaydata->DeviceName, info->szDevice, sizeof(displaydata->DeviceName));
displaydata->MonitorHandle = hMonitor; displaydata->MonitorHandle = hMonitor;
@@ -657,11 +659,19 @@ static void WIN_AddDisplay(SDL_VideoDevice *_this, HMONITOR hMonitor, const MONI
#ifdef HAVE_DXGI1_6_H #ifdef HAVE_DXGI1_6_H
WIN_GetHDRProperties(_this, hMonitor, &display.HDR); WIN_GetHDRProperties(_this, hMonitor, &display.HDR);
#endif #endif
SDL_AddVideoDisplay(&display, false); if (SDL_AddVideoDisplay(&display, false)) {
// The mode is owned by the video subsystem
mode.internal = NULL;
} else {
SDL_free(displaydata);
}
SDL_free(display.name); SDL_free(display.name);
done: done:
*display_index += 1; *display_index += 1;
cleanup:
SDL_free(mode.internal);
} }
typedef struct _WIN_AddDisplaysData typedef struct _WIN_AddDisplaysData