ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-23 22:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS2_VideoQuit(): avoid double free()ing of displays.

Browse source 
Our caller SDL_VideoQuit() already frees display_modes, driverdata, etc.
Noticed in bitwiseworks' version at https://github.com/bitwiseworks/SDL2-os2
This commit is contained in:
Ozkan Sezer 2020-10-14 23:01:04 +03:00
parent fba32ee21f
commit fe2cc8d86c
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/video/os2/SDL_os2video.c
View file

@ -1612,36 +1612,13 @@ static int OS2_VideoInit(_THIS)
static void OS2_VideoQuit(_THIS) static void OS2_VideoQuit(_THIS)
{ {
PSDL_VideoData pVData = (PSDL_VideoData)_this->driverdata; PSDL_VideoData pVData = (PSDL_VideoData)_this->driverdata;
ULONG ulDisplayIdx, ulModeIdx;
SDL_VideoDisplay *pSDLDisplay;
OS2_QuitMouse( _this ); OS2_QuitMouse( _this );
WinDestroyMsgQueue( pVData->hmq ); WinDestroyMsgQueue( pVData->hmq );
WinTerminate( pVData->hab ); WinTerminate( pVData->hab );
// We support only one display. Free all listed displays data for the future. /* our caller SDL_VideoQuit() already frees display_modes, driverdata, etc. */
for( ulDisplayIdx = 0; ulDisplayIdx < _this->num_displays; ulDisplayIdx++ )
{
pSDLDisplay = &_this->displays[ulDisplayIdx];
// Free video mode data (PMODEDATA).
if ( pSDLDisplay->desktop_mode.driverdata != NULL )
SDL_free( pSDLDisplay->desktop_mode.driverdata );
// We support only one mode - desktop_mode. Free all modes for the future.
for( ulModeIdx = 0; ulModeIdx < pSDLDisplay->num_display_modes;
ulModeIdx++ )
if ( pSDLDisplay->display_modes[ulModeIdx].driverdata != NULL )
SDL_free( pSDLDisplay->display_modes[ulModeIdx].driverdata );
// Free display data (PDISPLAYDATA).
if ( pSDLDisplay->driverdata != NULL )
{
SDL_free( pSDLDisplay->driverdata );
pSDLDisplay->driverdata = NULL;
}
}
} }
static int OS2_GetDisplayBounds(_THIS, SDL_VideoDisplay *display, static int OS2_GetDisplayBounds(_THIS, SDL_VideoDisplay *display,