From 3de73e5ee550ff9715e3c6034b2575a4386cf331 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 21 Jun 2011 13:43:08 -0700 Subject: [PATCH] * xterm.c (xim_initialize, same_x_server): Strlen may not fit in int. --- src/ChangeLog | 2 ++ src/xterm.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f0752ff8e0c..41b2fe9aab0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-21 Paul Eggert + * xterm.c (xim_initialize, same_x_server): Strlen may not fit in int. + * xsmfns.c (smc_save_yourself_CB, x_session_initialize): Avoid strlen. (x_session_initialize): Do not assume string length fits in int. diff --git a/src/xterm.c b/src/xterm.c index f40d260dabe..c1134521c71 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8084,7 +8084,7 @@ xim_initialize (struct x_display_info *dpyinfo, char *resource_name) { #ifdef HAVE_X11R6_XIM struct xim_inst_t *xim_inst; - int len; + ptrdiff_t len; xim_inst = (struct xim_inst_t *) xmalloc (sizeof (struct xim_inst_t)); dpyinfo->xim_callback_data = xim_inst; @@ -9720,8 +9720,8 @@ same_x_server (const char *name1, const char *name2) { int seen_colon = 0; const char *system_name = SSDATA (Vsystem_name); - int system_name_length = strlen (system_name); - int length_until_period = 0; + ptrdiff_t system_name_length = SBYTES (Vsystem_name); + ptrdiff_t length_until_period = 0; while (system_name[length_until_period] != 0 && system_name[length_until_period] != '.') -- 2.39.2