aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-08-29 13:03:30 -0700
committerPaul Eggert2011-08-29 13:03:30 -0700
commitae58ff1fbc37d8ace14dae8cc15859add5edac7f (patch)
tree45d5e73297f511ff139f6333e714e67b2bd6dc18 /src
parentb7163a504a0b26e0068b6bc37a2b192e5e0cdac8 (diff)
downloademacs-ae58ff1fbc37d8ace14dae8cc15859add5edac7f.tar.gz
emacs-ae58ff1fbc37d8ace14dae8cc15859add5edac7f.zip
* xterm.c (x_io_error_quitter): Don't overrun sprintf buffer.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xterm.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 53344aa7dd9..38779ef8598 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -97,6 +97,8 @@
97 * xfns.c (x_window): Make sprintf buffer a bit bigger 97 * xfns.c (x_window): Make sprintf buffer a bit bigger
98 to avoid potential buffer overrun. 98 to avoid potential buffer overrun.
99 99
100 * xterm.c (x_io_error_quitter): Don't overrun sprintf buffer.
101
1002011-08-26 Paul Eggert <eggert@cs.ucla.edu> 1022011-08-26 Paul Eggert <eggert@cs.ucla.edu>
101 103
102 Integer and memory overflow issues (Bug#9196). 104 Integer and memory overflow issues (Bug#9196).
diff --git a/src/xterm.c b/src/xterm.c
index c07caec6c78..86393cf411f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7900,7 +7900,8 @@ x_io_error_quitter (Display *display)
7900{ 7900{
7901 char buf[256]; 7901 char buf[256];
7902 7902
7903 sprintf (buf, "Connection lost to X server `%s'", DisplayString (display)); 7903 snprintf (buf, sizeof buf, "Connection lost to X server `%s'",
7904 DisplayString (display));
7904 x_connection_closed (display, buf); 7905 x_connection_closed (display, buf);
7905 return 0; 7906 return 0;
7906} 7907}