martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid crashes when trying to load bad GIF files

Browse Source 
* src/image.c (gif_load): Handle the case when GifErrorString
returns NULL.  (Bug#43281)
This commit is contained in:
Eli Zaretskii
2020-09-08 19:17:23 +03:00
parent 7938713105
commit 366a97c980
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/image.c
View File

@@ -8160,11 +8160,13 @@ gif_load (struct frame *f, struct image *img)
if (gif == NULL)
{
#if HAVE_GIFERRORSTRING
image_error ("Cannot open `%s': %s",
file, build_string (GifErrorString (gif_err)));
#else
image_error ("Cannot open `%s'", file);
const char *errstr = GifErrorString (gif_err);
if (errstr)
image_error ("Cannot open `%s': %s", file, build_string (errstr));
else
#endif
image_error ("Cannot open `%s'", file);
return 0;
}
}
@@ -8190,11 +8192,13 @@ gif_load (struct frame *f, struct image *img)
if (!gif)
{
#if HAVE_GIFERRORSTRING
image_error ("Cannot open memory source `%s': %s",
img->spec, build_string (GifErrorString (gif_err)));
#else
image_error ("Cannot open memory source `%s'", img->spec);
const char *errstr = GifErrorString (gif_err);
if (errstr)
image_error ("Cannot open memory source `%s': %s",
img->spec, build_string (errstr));
else
#endif
image_error ("Cannot open memory source `%s'", img->spec);
return 0;
}
}
@@ -8474,9 +8478,9 @@ gif_load (struct frame *f, struct image *img)
if (error_text)
image_error ("Error closing `%s': %s",
img->spec, build_string (error_text));
#else
image_error ("Error closing `%s'", img->spec);
else
#endif
image_error ("Error closing `%s'", img->spec);
}
/* Maybe fill in the background field while we have ximg handy. */