* xterm.c (x_make_frame_visible, same_x_server): Redo to avoid overflow

concerns.

diff --git a/src/ChangeLog b/src/ChangeLog
index b268681187572b34ac3ea8cbebfc79f7d6b73677..a8bda0915f6f00c0ae10a560c6ee7bded41b84fa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xterm.c (x_make_frame_visible, same_x_server): Redo to avoid overflow
+       concerns.
+
        * chartab.c (sub_char_table_ref_and_range): Redo to avoid overflow
        concerns.
 

diff --git a/src/xterm.c b/src/xterm.c
index f87c22912a4b135e26547440450808a0b7312035..cdbce2f1c860e4d3deaafb190d222ec8628eb64b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9121,7 +9121,7 @@ x_make_frame_visible (struct frame *f)
        unknown reason, the call to XtMapWidget is completely ignored.
        Mapping the widget a second time works.  */
 
-    if (!FRAME_VISIBLE_P (f) && --retry_count > 0)
+    if (!FRAME_VISIBLE_P (f) && --retry_count != 0)
       goto retry;
   }
 }
@@ -9726,7 +9726,7 @@ same_x_server (const char *name1, const char *name2)
   for (; *name1 != '\0' && *name1 == *name2; name1++, name2++)
     {
       if (*name1 == ':')
-       seen_colon++;
+       seen_colon = 1;
       if (seen_colon && *name1 == '.')
        return 1;
     }