From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 11 Dec 2020 20:16:04 +0000 (+0100)
Subject: Fix image-cache-size crash
X-Git-Tag: emacs-28.0.90~4776
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=711e7bf29cd405a69466feddb5ff9b9a5dfd2a03;p=emacs.git

Fix image-cache-size crash

* src/image.c (image_frame_cache_size): Ensure that img->pixmap is
in use before trying to access it.
---

diff --git a/src/image.c b/src/image.c
index 8607b33a7a8..0dd108a96b5 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1795,8 +1795,9 @@ which is then usually a filename.  */)
 static int
 image_frame_cache_size (struct frame *f)
 {
-  struct image_cache *c = FRAME_IMAGE_CACHE (f);
   int total = 0;
+#ifdef USE_CAIRO
+  struct image_cache *c = FRAME_IMAGE_CACHE (f);
 
   if (!c)
     return 0;
@@ -1805,12 +1806,11 @@ image_frame_cache_size (struct frame *f)
     {
       struct image *img = c->images[i];
 
-#ifdef USE_CAIRO
-      if (img)
+      if (img && img->pixmap && img->pixmap != NO_PIXMAP)
 	total += img->pixmap->width * img->pixmap->height  *
 	  img->pixmap->bits_per_pixel / 8;
-#endif
     }
+#endif
   return total;
 }