diff options
| author | Jim Meyering | 2012-05-02 18:17:03 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-02 18:17:03 +0800 |
| commit | 3f83ace8490fef379df303d1d7a86b099329f018 (patch) | |
| tree | adc306691f953dcd7ba2f8ab29536dc43cace40f /src | |
| parent | 9aa071dfb9739328b39b9cbb4130b39b5ed30c85 (diff) | |
| download | emacs-3f83ace8490fef379df303d1d7a86b099329f018.tar.gz emacs-3f83ace8490fef379df303d1d7a86b099329f018.zip | |
* src/xterm.c (x_term_init): Use memcpy instead of strncpy.
Fixes: debbugs:11373
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fb5cab2ac3c..33d95c6c7c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-05-02 Jim Meyering <jim@meyering.net> | ||
| 2 | |||
| 3 | * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373). | ||
| 4 | |||
| 1 | 2012-05-02 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-05-02 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (pos_visible_p): If already at a newline from the | 7 | * 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) | |||
| 10146 | 10146 | ||
| 10147 | /* Set the name of the terminal. */ | 10147 | /* Set the name of the terminal. */ |
| 10148 | terminal->name = (char *) xmalloc (SBYTES (display_name) + 1); | 10148 | terminal->name = (char *) xmalloc (SBYTES (display_name) + 1); |
| 10149 | strncpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); | 10149 | memcpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); |
| 10150 | terminal->name[SBYTES (display_name)] = 0; | 10150 | terminal->name[SBYTES (display_name)] = 0; |
| 10151 | 10151 | ||
| 10152 | #if 0 | 10152 | #if 0 |