Added checks for NULL data sources to individual loaders.

Apps shouldn't be calling them, but they do. Naughty naughty! :)
libsdl-org · Jan 4, 2004 · b04e82b · b04e82b
1 parent c7a0893
commit b04e82b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 0 deletions.
diff --git a/IMG_jpg.c b/IMG_jpg.c
@@ -197,6 +197,11 @@ SDL_Surface *IMG_LoadJPG_RW(SDL_RWops *src)
 	SDL_Surface *volatile surface = NULL;
 	struct my_error_mgr jerr;
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
+
 	/* Create a decompression structure and load the JPEG header */
 	cinfo.err = jpeg_std_error(&jerr.errmgr);
 	jerr.errmgr.error_exit = my_error_exit;

diff --git a/IMG_lbm.c b/IMG_lbm.c
@@ -94,6 +94,10 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src )
 	error   = NULL;
 	MiniBuf = NULL;
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
 	if ( !SDL_RWread( src, id, 4, 1 ) )
 	{
 		error="error reading IFF chunk";

diff --git a/IMG_pcx.c b/IMG_pcx.c
@@ -96,6 +96,10 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src)
 	char *error = NULL;
 	int bits, src_bits;
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
 	if ( ! SDL_RWread(src, &pcxh, sizeof(pcxh), 1) ) {
 		error = "file truncated";
 		goto done;

diff --git a/IMG_png.c b/IMG_png.c
@@ -111,6 +111,11 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
 	volatile int ckey = -1;
 	png_color_16 *transv;
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
+
 	/* Initialize the data we will clean up when we're done */
 	png_ptr = NULL; info_ptr = NULL; row_pointers = NULL; surface = NULL;
 

diff --git a/IMG_pnm.c b/IMG_pnm.c
@@ -108,6 +108,11 @@ SDL_Surface *IMG_LoadPNM_RW(SDL_RWops *src)
 
 #define ERROR(s) do { error = (s); goto done; } while(0)
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
+
 	SDL_RWread(src, magic, 2, 1);
 	kind = magic[1] - '1';
 	ascii = 1;

diff --git a/IMG_tga.c b/IMG_tga.c
@@ -107,6 +107,11 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src)
     Uint32 pixel;
     int count, rep;
 
+    if ( !src ) {
+        /* The error message has been set in SDL_RWFromFile */
+        return NULL;
+    }
+
     if(!SDL_RWread(src, &hdr, sizeof(hdr), 1))
 	goto error;
     ncols = LE16(hdr.cmap_len);

diff --git a/IMG_tif.c b/IMG_tif.c
@@ -110,6 +110,10 @@ SDL_Surface* IMG_LoadTIF_RW(SDL_RWops* src)
 	Uint32 x, y;
 	Uint32 half;
 
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
 
 	/* turn off memory mapped access with the m flag */
 	tiff = TIFFClientOpen("SDL_image", "rm", (thandle_t)src, 

diff --git a/IMG_xcf.c b/IMG_xcf.c
@@ -678,6 +678,11 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src) {
 
   unsigned char * (* load_tile) (SDL_RWops *, Uint32, int, int, int);
 
+  if ( !src ) {
+    /* The error message has been set in SDL_RWFromFile */
+    return NULL;
+  }
+
   /* Initialize the data we will clean up when we're done */
   surface = NULL;
   read_error = 0;

diff --git a/IMG_xpm.c b/IMG_xpm.c
@@ -456,6 +456,10 @@ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src)
 /* Load a XPM type image from an RWops datasource */
 SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src)
 {
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
 	return load_xpm(NULL, src);
 }
 

diff --git a/IMG_xxx.c b/IMG_xxx.c
@@ -43,6 +43,10 @@ int IMG_isXXX(SDL_RWops *src)
 /* Load a XXX type image from an SDL datasource */
 SDL_Surface *IMG_LoadXXX_RW(SDL_RWops *src)
 {
+	if ( !src ) {
+		/* The error message has been set in SDL_RWFromFile */
+		return NULL;
+	}
 	return(NULL);
 }