merge from trunk

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 716b1177fd1..2171f2b8748 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
 
         * image.c (imagemagick_get_animation_cache): Don't segfault on
         each invocation.
+        (imagemagick_get_animation_cache): Revert to previous definition
+        so that it actually works.  But keep the memory leak fix.
+        (imagemagick_get_animation_cache): Fix memory leak.
 
 2013-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/image.c b/src/image.c
index 2b415fb9b97..7a6323ad332 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7945,10 +7945,10 @@ imagemagick_get_animation_cache (MagickWand *wand)
   if (strcmp (signature, cache->signature))
     {
       cache->next = imagemagick_create_cache (signature);
-      DestroyString (signature);
       return cache->next;
     }
 
+  DestroyString (signature);
   cache->update_time = current_emacs_time ();
   return cache;
 }