Mercurial > sdl-ios-xcode
changeset 3034:0e821769fc51
Fixed NULL pointer dereference
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 13 Jan 2009 03:53:22 +0000 |
| parents | 4e4f47c5f941 |
| children | ff602fdfdedc |
| files | CREDITS include/SDL_compat.h src/SDL_compat.c |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CREDITS Mon Jan 12 22:36:12 2009 +0000 +++ b/CREDITS Tue Jan 13 03:53:22 2009 +0000 @@ -25,8 +25,9 @@ * Szymon "Wilku" Wilczek for adding support for multiple mice and tablets during the Google Summer of Code 2008 -* Marty Leisner, Andrew, Will, Edgar Simo, Donny Viszneki, and Couriersud - for helping find SDL 1.3 bugs in the great SDL Bug Hunt of January 2009! +* Marty Leisner, Andrew, Will, Edgar Simo, Donny Viszneki, Andrea Mazzoleni, + and Couriersud for helping find SDL 1.3 bugs in the great SDL Bug Hunt + of January 2009! * Donny Viszneki for helping fix SDL 1.3 bugs in the great SDL Bug Hunt of January 2009!
--- a/include/SDL_compat.h Mon Jan 12 22:36:12 2009 +0000 +++ b/include/SDL_compat.h Tue Jan 13 03:53:22 2009 +0000 @@ -228,8 +228,7 @@ extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags); -extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(SDL_PixelFormat * format, - Uint32 flags); +extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags); extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags);
--- a/src/SDL_compat.c Mon Jan 12 22:36:12 2009 +0000 +++ b/src/SDL_compat.c Tue Jan 13 03:53:22 2009 +0000 @@ -114,7 +114,7 @@ } SDL_Rect ** -SDL_ListModes(SDL_PixelFormat * format, Uint32 flags) +SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags) { int i, nmodes; SDL_Rect **modes; @@ -127,6 +127,10 @@ return (SDL_Rect **) (-1); } + if (!format) { + format = SDL_GetVideoInfo()->vfmt; + } + /* Memory leak, but this is a compatibility function, who cares? */ nmodes = 0; modes = NULL;