4 files changed, 13 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b20f9cc10e..8440647737c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
+        now that Emacs supports ImageMagick animations.
+
 2013-08-16  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-cmds.el (top): Don't declare `buffer-name'.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 3283712bf0a..9cac618b159 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -779,7 +779,6 @@ element is the data blob and the second element is the content-type."
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
   (if (or (not (fboundp 'imagemagick-types))
-          (eq (image-type-from-data data) 'gif)
           (not (get-buffer-window (current-buffer))))
       (create-image data nil t :ascent 100)
     (let ((edges (window-inside-pixel-edges
diff --git a/src/ChangeLog b/src/ChangeLog
index d5c97748d1a..de9724238a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * image.c: Implement an ImageMagick per-image cache.
+        (imagemagick_get_animation_cache): Fix a double-free error.
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/src/image.c b/src/image.c
index 082cc6a762a..3607be1e86c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7901,7 +7901,7 @@ void
 imagemagick_prune_animation_cache ()
 {
   struct animation_cache *cache = animation_cache;
-  struct animation_cache *prev;
+  struct animation_cache *prev = NULL;
   EMACS_TIME old = sub_emacs_time (current_emacs_time (),
                                    EMACS_TIME_FROM_DOUBLE (60));
 
@@ -7920,17 +7920,18 @@ imagemagick_prune_animation_cache ()
           cache = cache->next;
           free (this_cache);
         }
-      else {
-        prev = cache;
-        cache = cache->next;
-      }
+      else
+        {
+          prev = cache;
+          cache = cache->next;
+        }
     }
 }
 
 struct animation_cache *
 imagemagick_get_animation_cache (MagickWand *wand)
 {
-  char *signature = MagickGetImageSignature (wand);
+  char *signature = xstrdup (MagickGetImageSignature (wand));
   struct animation_cache *cache = animation_cache;
 
   imagemagick_prune_animation_cache ();