aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-08-29 12:59:51 -0700
committerPaul Eggert2011-08-29 12:59:51 -0700
commitb7163a504a0b26e0068b6bc37a2b192e5e0cdac8 (patch)
tree1b4c4a8041d8857f5a865548f8322e2d9f0ec445 /src
parent670741ab04da51fa86058b6a88f0923adfcea1b2 (diff)
downloademacs-b7163a504a0b26e0068b6bc37a2b192e5e0cdac8.tar.gz
emacs-b7163a504a0b26e0068b6bc37a2b192e5e0cdac8.zip
* xfns.c (x_window): Make sprintf buffer a bit bigger
to avoid potential buffer overrun.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xfns.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index aeb984ee8df..53344aa7dd9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -94,6 +94,9 @@
94 * xfaces.c (x_update_menu_appearance): Don't overrun buffer 94 * xfaces.c (x_update_menu_appearance): Don't overrun buffer
95 if X resource line is longer than 512 bytes. 95 if X resource line is longer than 512 bytes.
96 96
97 * xfns.c (x_window): Make sprintf buffer a bit bigger
98 to avoid potential buffer overrun.
99
972011-08-26 Paul Eggert <eggert@cs.ucla.edu> 1002011-08-26 Paul Eggert <eggert@cs.ucla.edu>
98 101
99 Integer and memory overflow issues (Bug#9196). 102 Integer and memory overflow issues (Bug#9196).
diff --git a/src/xfns.c b/src/xfns.c
index 9a3d5fcda83..194a8f063b7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2440,7 +2440,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2440 /* Do some needed geometry management. */ 2440 /* Do some needed geometry management. */
2441 { 2441 {
2442 ptrdiff_t len; 2442 ptrdiff_t len;
2443 char *tem, shell_position[32]; 2443 char *tem, shell_position[sizeof "=x++" + 4 * INT_STRLEN_BOUND (int)];
2444 Arg gal[10]; 2444 Arg gal[10];
2445 int gac = 0; 2445 int gac = 0;
2446 int extra_borders = 0; 2446 int extra_borders = 0;