ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-02-22 03:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check SDL_GetNumDisplayModes return value for errors

Browse source
This commit is contained in:
Tim Angus 2015-06-28 18:01:03 +01:00
parent ea9161f4a3
commit 61825d8e5f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/sdl/sdl_glimp.c
View file

@ -130,21 +130,21 @@ static void GLimp_DetectAvailableModes(void)
{ {
int i, j; int i, j;
char buf[ MAX_STRING_CHARS ] = { 0 }; char buf[ MAX_STRING_CHARS ] = { 0 };
size_t numSDLModes; int numSDLModes;
SDL_Rect *modes; SDL_Rect *modes;
int numModes = 0; int numModes = 0;
int display = SDL_GetWindowDisplayIndex( SDL_window ); int display = SDL_GetWindowDisplayIndex( SDL_window );
numSDLModes = SDL_GetNumDisplayModes( display );
SDL_DisplayMode windowMode; SDL_DisplayMode windowMode;
if( SDL_GetWindowDisplayMode( SDL_window, &windowMode ) < 0 ) if( SDL_GetWindowDisplayMode( SDL_window, &windowMode ) < 0 || numSDLModes <= 0 )
{ {
ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected\n" ); ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected\n" );
return; return;
} }
numSDLModes = SDL_GetNumDisplayModes( display ); modes = SDL_calloc( (size_t)numSDLModes, sizeof( SDL_Rect ) );
modes = SDL_calloc( numSDLModes, sizeof( SDL_Rect ) );
if ( !modes ) if ( !modes )
{ {
ri.Error( ERR_FATAL, "Out of memory" ); ri.Error( ERR_FATAL, "Out of memory" );