aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/image.c2
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 @@
2 2
3 * image.c (imagemagick_get_animation_cache): Don't segfault on 3 * image.c (imagemagick_get_animation_cache): Don't segfault on
4 each invocation. 4 each invocation.
5 (imagemagick_get_animation_cache): Revert to previous definition
6 so that it actually works. But keep the memory leak fix.
7 (imagemagick_get_animation_cache): Fix memory leak.
5 8
62013-08-19 Paul Eggert <eggert@cs.ucla.edu> 92013-08-19 Paul Eggert <eggert@cs.ucla.edu>
7 10
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)
7945 if (strcmp (signature, cache->signature)) 7945 if (strcmp (signature, cache->signature))
7946 { 7946 {
7947 cache->next = imagemagick_create_cache (signature); 7947 cache->next = imagemagick_create_cache (signature);
7948 DestroyString (signature);
7949 return cache->next; 7948 return cache->next;
7950 } 7949 }
7951 7950
7951 DestroyString (signature);
7952 cache->update_time = current_emacs_time (); 7952 cache->update_time = current_emacs_time ();
7953 return cache; 7953 return cache;
7954} 7954}