From f86c98305dbfd21b29a4c358d08662da0c135522 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 23 Mar 2011 01:15:28 -0700 Subject: [PATCH] * xterm.c (x_make_frame_visible, same_x_server): Redo to avoid overflow concerns. --- src/ChangeLog | 3 +++ src/xterm.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b2686811875..a8bda0915f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-03-23 Paul Eggert + * 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 f87c22912a4..cdbce2f1c86 100644 --- 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; } -- 2.39.5