Merge from origin/emacs-27

366a97c980 (origin/emacs-27) Avoid crashes when trying to load bad GI...
7938713105 C++ Mode: handle comma separated brace initializers.
2b95300cf8 * lisp/display-fill-column-indicator.el: Fix bug#41145

1 files changed, 14 insertions, 10 deletions

diff --git a/src/image.c b/src/image.c
index d8c34669cc4..6ecf6a70fe2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8276,11 +8276,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;
         }
     }
@@ -8306,11 +8308,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;
         }
     }
@@ -8593,9 +8597,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. */