pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash with invalid bpp in SDL_SetVideoMode()

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40457
This commit is contained in:
Sam Lantinga 2002-08-20 04:44:36 +00:00
parent f786844714
commit 9e7b2297be
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/video/SDL_video.c
View file

@ -362,7 +362,7 @@ int SDL_VideoModeOK (int width, int height, int bpp, Uint32 flags)
if ( bpp < 8 || bpp > 32 ) { if ( bpp < 8 || bpp > 32 ) {
return(0); return(0);
} }
if ( (width == 0) || (height == 0) ) { if ( (width <= 0) || (height <= 0) ) {
return(0); return(0);
} }
@ -415,8 +415,13 @@ static int SDL_GetVideoMode (int *w, int *h, int *BitsPerPixel, Uint32 flags)
SDL_PixelFormat format; SDL_PixelFormat format;
SDL_Rect **sizes; SDL_Rect **sizes;
/* Check parameters */
if ( *BitsPerPixel < 8 || *BitsPerPixel > 32 ) {
SDL_SetError("Invalid bits per pixel (range is {8...32})");
return(0);
}
if ((*w <= 0) || (*h <= 0)) { if ((*w <= 0) || (*h <= 0)) {
SDL_SetError("Invalid parameter"); SDL_SetError("Invalid width or height");
return(0); return(0);
} }