* image.c (imagemagick_get_animation_cache): Don't segfault when

pruning all entries.

* image.c (imagemagick_get_animation_cache): Don't segfault when
pruning all entries.
319a4d03 · Lars Magne Ingebrigtsen · f747d82e · 319a4d03 · 319a4d03
Commit 319a4d03 authored Aug 18, 2013 by Lars Magne Ingebrigtsen
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/image.c src/image.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-08-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* image.c (imagemagick_get_animation_cache): Don't segfault when
+	pruning all entries.
+
 2013-08-18  Ken Brown  <kbrown@cornell.edu>

 	* sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger

--- a/src/image.c
+++ b/src/image.c
@@ -7932,9 +7932,10 @@ struct animation_cache *
 imagemagick_get_animation_cache (MagickWand *wand)
 {
  char *signature = xstrdup (MagickGetImageSignature (wand));
-  struct animation_cache *cache = animation_cache;
+  struct animation_cache *cache;

  imagemagick_prune_animation_cache ();
+  cache = animation_cache;

  if (! cache)
    {