[Emacs-diffs] /srv/bzr/emacs/trunk r108637: * xterm.c (x_draw_underwave): Check for integer overflow.

[Paul Eggert]

------------------------------------------------------------
revno: 108637
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-17 00:39:50 -0700
message:
  * xterm.c (x_draw_underwave): Check for integer overflow.
  
  This pacifies gcc 4.7.0 -Wunsafe-loop-optimizations on x86-64.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-17 05:13:40 +0000
+++ b/src/ChangeLog     2012-06-17 07:39:50 +0000
@@ -1,3 +1,8 @@
+2012-06-17  Paul Eggert  <address@hidden>
+
+       * xterm.c (x_draw_underwave): Check for integer overflow.
+       This pacifies gcc 4.7.0 -Wunsafe-loop-optimizations on x86-64.
+
 2012-06-17  Jan Djärv  <address@hidden>
 
        * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-06-17 00:32:36 +0000
+++ b/src/xterm.c       2012-06-17 07:39:50 +0000
@@ -2710,6 +2710,9 @@
   else
     y2 += dy;
 
+  if (INT_MAX - dx < xmax)
+    abort ();
+
   while (x1 <= xmax)
     {
       XDrawLine (s->display, s->window, s->gc, x1, y1, x2, y2);