ngiflibSDL.c: do not coredump on GIF without any palette

fixes #22
miniupnp · Mar 4, 2023 · 231df82 · 231df82
1 parent 3a44ac7
commit 231df82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/invalid_gif/issue_22_CA_file2_0.gif b/invalid_gif/issue_22_CA_file2_0.gif
diff --git a/ngiflibSDL.c b/ngiflibSDL.c
@@ -189,19 +189,23 @@ struct ngiflibSDL_animation * SDL_LoadAnimatedGif(const char * file)
 			current_palette = gif->palette;
 			current_palette_size = gif->ncolors;
 		}
-		for(i = 0; i < current_palette_size; i++) {
-			surface->format->palette->colors[i].r = current_palette[i].r;
-			surface->format->palette->colors[i].g = current_palette[i].g;
-			surface->format->palette->colors[i].b = current_palette[i].b;
-			//printf("#%02x%02x%02x ",  current_palette[i].r,  current_palette[i].g,  current_palette[i].b);
-		}
-		for(; i < gif->ncolors; i++) {
-			surface->format->palette->colors[i].r = gif->palette[i].r;
-			surface->format->palette->colors[i].g = gif->palette[i].g;
-			surface->format->palette->colors[i].b = gif->palette[i].b;
-			//printf("#%02x%02x%02x ",  gif->palette[i].r,  gif->palette[i].g,  gif->palette[i].b);
+		if (current_palette != NULL) {
+			for(i = 0; i < current_palette_size; i++) {
+				surface->format->palette->colors[i].r = current_palette[i].r;
+				surface->format->palette->colors[i].g = current_palette[i].g;
+				surface->format->palette->colors[i].b = current_palette[i].b;
+				//printf("#%02x%02x%02x ",  current_palette[i].r,  current_palette[i].g,  current_palette[i].b);
+			}
+			for(; i < gif->ncolors; i++) {
+				surface->format->palette->colors[i].r = gif->palette[i].r;
+				surface->format->palette->colors[i].g = gif->palette[i].g;
+				surface->format->palette->colors[i].b = gif->palette[i].b;
+				//printf("#%02x%02x%02x ",  gif->palette[i].r,  gif->palette[i].g,  gif->palette[i].b);
+			}
+			//printf("\n");
+		} else {
+			fprintf(stderr, "no palette in GIF\n");
 		}
-		printf("\n");
 		psrc = p; pdst = surface->pixels;
 		for(i=0; i<gif->height; i++) {
 			ngiflib_memcpy(pdst, psrc, gif->width);