From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 16 Mar 2016 17:04:16 +0000 (+0200)
Subject: Avoid segfaults due to frame image cache being absent
X-Git-Tag: emacs-25.0.93~89^2~54
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6d164f;p=emacs.git

Avoid segfaults due to frame image cache being absent

* src/image.c (cache_image): If the frame doesn't have an image
cache, create it.  (Bug#23028)
---

diff --git a/src/image.c b/src/image.c
index a44b90b78e7..e8418b840c6 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1830,6 +1830,9 @@ cache_image (struct frame *f, struct image *img)
   struct image_cache *c = FRAME_IMAGE_CACHE (f);
   ptrdiff_t i;
 
+  if (!c)
+    c = FRAME_IMAGE_CACHE (f) = make_image_cache ();
+
   /* Find a free slot in c->images.  */
   for (i = 0; i < c->used; ++i)
     if (c->images[i] == NULL)