From: Jim Meyering Date: Wed, 2 May 2012 10:17:03 +0000 (+0800) Subject: * src/xterm.c (x_term_init): Use memcpy instead of strncpy. X-Git-Tag: emacs-24.2.90~471^2~213 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f83ace8490fef379df303d1d7a86b099329f018;p=emacs.git * src/xterm.c (x_term_init): Use memcpy instead of strncpy. Fixes: debbugs:11373 --- diff --git a/src/ChangeLog b/src/ChangeLog index fb5cab2ac3c..33d95c6c7c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-02 Jim Meyering + + * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373). + 2012-05-02 Eli Zaretskii * xdisp.c (pos_visible_p): If already at a newline from the diff --git a/src/xterm.c b/src/xterm.c index f5272fc7630..02fa137d6a7 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10146,7 +10146,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* Set the name of the terminal. */ terminal->name = (char *) xmalloc (SBYTES (display_name) + 1); - strncpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); + memcpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); terminal->name[SBYTES (display_name)] = 0; #if 0