* image.c (imagemagick_get_animation_cache): Don't segfault on each invocation.

Bug introduced by 2013-08-19T07:01:37Z!eggert@cs.ucla.edu, which obviously hadn't even been
tested once.

diff --git a/src/ChangeLog b/src/ChangeLog
index c5a6f4d19c3e9fee827317a66dc0afc5ae8c7a28..716b1177fd15b06b0241f60fcf1273cd59c432b5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * image.c (imagemagick_get_animation_cache): Don't segfault on
+       each invocation.
+
 2013-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        * image.c: Fix animation cache signature memory leak.

diff --git a/src/image.c b/src/image.c
index 68d78fc9eef1536c938706682d66fb68496be3a5..ec89ee076d9cd3d97e48864c4cad1ae3144562fa 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7927,23 +7927,27 @@ imagemagick_get_animation_cache (MagickWand *wand)
 {
   char *signature = MagickGetImageSignature (wand);
   struct animation_cache *cache;
-  struct animation_cache **pcache = &animation_cache;
+  struct animation_cache **pcache;
 
   imagemagick_prune_animation_cache ();
-  cache = animation_cache;
 
-  for (pcache = &animation_cache; *pcache; pcache = &cache->next)
+  if (! animation_cache)
+    animation_cache = cache = imagemagick_create_cache (signature);
+  else
     {
-      cache = *pcache;
-      if (! cache)
-       {
-         *pcache = cache = imagemagick_create_cache (signature);
-         break;
-       }
-      if (strcmp (signature, cache->signature) == 0)
+      for (pcache = &animation_cache; *pcache; pcache = &cache->next)
        {
-         DestroyString (signature);
-         break;
+         cache = *pcache;
+         if (! cache)
+           {
+             animation_cache = cache = imagemagick_create_cache (signature);
+             break;
+           }
+         if (strcmp (signature, cache->signature) == 0)
+           {
+             DestroyString (signature);
+             break;
+           }
        }
     }