merge from trunk

1 files changed, 7 insertions, 6 deletions

diff --git a/src/image.c b/src/image.c
index 082cc6a762a..3607be1e86c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7901,7 +7901,7 @@ void
 imagemagick_prune_animation_cache ()
 {
   struct animation_cache *cache = animation_cache;
-  struct animation_cache *prev;
+  struct animation_cache *prev = NULL;
   EMACS_TIME old = sub_emacs_time (current_emacs_time (),
                                    EMACS_TIME_FROM_DOUBLE (60));
 
@@ -7920,17 +7920,18 @@ imagemagick_prune_animation_cache ()
           cache = cache->next;
           free (this_cache);
         }
-      else {
-        prev = cache;
-        cache = cache->next;
-      }
+      else
+        {
+          prev = cache;
+          cache = cache->next;
+        }
     }
 }
 
 struct animation_cache *
 imagemagick_get_animation_cache (MagickWand *wand)
 {
-  char *signature = MagickGetImageSignature (wand);
+  char *signature = xstrdup (MagickGetImageSignature (wand));
   struct animation_cache *cache = animation_cache;
 
   imagemagick_prune_animation_cache ();