emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 d6d164f: Avoid segfaults due to frame image cache


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-25 d6d164f: Avoid segfaults due to frame image cache being absent
Date: Wed, 16 Mar 2016 17:05:50 +0000

branch: emacs-25
commit d6d164f6110a68a3acb816fd2ae7e55e71a18aef
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 src/image.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/image.c b/src/image.c
index a44b90b..e8418b8 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]