procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-19 20:11:40 +02:00
commit 0c1b014bcd
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -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>

2
src/image.c
View file

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