2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 454413c85c0..36c379c56dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * image.c (imagemagick_compute_animated_image): Don't crash if we
+        have an animation with different-sized images (bug#15313).
+
 2013-11-30  Martin Rudalics  <rudalics@gmx.at>
 
         Remove some unused items introduced during pixelwise change.
diff --git a/src/image.c b/src/image.c
index 167ee2da303..91038dd480a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8093,7 +8093,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
             {
               /* Sanity check.  This shouldn't happen, but apparently
                  also does in some pictures.  */
-              if (x + source_left > dest_width)
+              if (x + source_left > dest_width - 1)
                 break;
               /* Normally we only copy over non-transparent pixels,
                  but if the disposal method is "Background", then we