From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 19 Aug 2013 17:56:58 +0000 (+0200)
Subject: (imagemagick_get_animation_cache): Fix memory leak.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=453f40228f8ff3d43665f5bf008b117bf9b9a7dc;p=emacs.git

(imagemagick_get_animation_cache): Fix memory leak.
---

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;
 }