[Emacs-diffs] trunk r113952: (imagemagick_get_animation_cache): Fix memory leak.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113952
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-19 19:56:58 +0200
message:
  (imagemagick_get_animation_cache): Fix memory leak.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-19 14:52:52 +0000
+++ b/src/ChangeLog     2013-08-19 17:56:58 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-19 16:24:06 +0000
+++ b/src/image.c       2013-08-19 17:56:58 +0000
@@ -7945,10 +7945,10 @@
   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;
 }