Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed NULL pointer dereference

  • Loading branch information
slouken committed Jan 13, 2009
1 parent f48775b commit c39a689d5f812a617c362795ed5b211bbd35c832
Showing with 9 additions and 5 deletions.
  1. +3 −2 CREDITS
  2. +1 −2 include/SDL_compat.h
  3. +5 −1 src/SDL_compat.c
@@ -25,8 +25,9 @@ Thanks to everyone who made this possible, including:
* 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!
@@ -228,8 +228,7 @@ extern DECLSPEC const SDL_VideoInfo *SDLCALL SDL_GetVideoInfo(void);
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);
@@ -114,7 +114,7 @@ SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags)
}

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 @@ SDL_ListModes(SDL_PixelFormat * format, Uint32 flags)
return (SDL_Rect **) (-1);
}

if (!format) {
format = SDL_GetVideoInfo()->vfmt;
}

/* Memory leak, but this is a compatibility function, who cares? */
nmodes = 0;
modes = NULL;

0 comments on commit c39a689

Please sign in to comment.