[Emacs-diffs] trunk r115328: Fix duckduckgo imagemagick crash

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 115328
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15313
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-01 15:34:05 +0100
message:
  Fix duckduckgo imagemagick crash
  * image.c (imagemagick_compute_animated_image): Don't crash if we
  have an animation with different-sized images.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-01 13:40:19 +0000
+++ b/src/ChangeLog     2013-12-01 14:34:05 +0000
@@ -1,3 +1,8 @@
+2013-12-01  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        Remove some unused items introduced during pixelwise change.

=== modified file 'src/image.c'
--- a/src/image.c       2013-11-23 01:55:16 +0000
+++ b/src/image.c       2013-12-01 14:34:05 +0000
@@ -8093,7 +8093,7 @@
            {
              /* 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