mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2012-11-09T14:45:15Z!dmantipov@yandex.ru

Browse source
This commit is contained in:
Glenn Morris 2012-11-12 18:25:59 -08:00
commit f78ee6afc0
29 changed files with 395 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-11-13 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (decode_mode_spec): Limit the value of WIDTH argument
passed to pint2str and pint2hrstr to be at most the size of the
frame's decode_mode_spec_buffer. This avoids crashes with very
large values of FIELD_WIDTH argument to decode_mode_spec.
(Bug#12867)
2012-11-13 Paul Eggert <eggert@cs.ucla.edu>
Fix a race with verify-visited-file-modtime (Bug#12863).

16
src/xdisp.c
View file

@ -21371,6 +21371,12 @@ decode_mode_spec (struct window *w, register int c, int field_width,
Lisp_Object obj;
struct frame *f = XFRAME (WINDOW_FRAME (w));
char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
/* We are going to use f->decode_mode_spec_buffer as the buffer to
produce strings from numerical values, so limit preposterously
large values of FIELD_WIDTH to avoid overrunning the buffer's
end. The size of the buffer is enough for FRAME_MESSAGE_BUF_SIZE
bytes plus the terminating null. */
int width = min (field_width, FRAME_MESSAGE_BUF_SIZE (f));
struct buffer *b = current_buffer;
obj = Qnil;
@ -21466,7 +21472,7 @@ decode_mode_spec (struct window *w, register int c, int field_width,
{
ptrdiff_t col = current_column ();
wset_column_number_displayed (w, make_number (col));
pint2str (decode_mode_spec_buf, field_width, col);
pint2str (decode_mode_spec_buf, width, col);
return decode_mode_spec_buf;
}
@ -21497,14 +21503,14 @@ decode_mode_spec (struct window *w, register int c, int field_width,
case 'i':
{
ptrdiff_t size = ZV - BEGV;
pint2str (decode_mode_spec_buf, field_width, size);
pint2str (decode_mode_spec_buf, width, size);
return decode_mode_spec_buf;
}
case 'I':
{
ptrdiff_t size = ZV - BEGV;
pint2hrstr (decode_mode_spec_buf, field_width, size);
pint2hrstr (decode_mode_spec_buf, width, size);
return decode_mode_spec_buf;
}
@ -21611,12 +21617,12 @@ decode_mode_spec (struct window *w, register int c, int field_width,
line_number_displayed = 1;
/* Make the string to show. */
pint2str (decode_mode_spec_buf, field_width, topline + nlines);
pint2str (decode_mode_spec_buf, width, topline + nlines);
return decode_mode_spec_buf;
no_value:
{
char* p = decode_mode_spec_buf;
int pad = field_width - 2;
int pad = width - 2;
while (pad-- > 0)
*p++ = ' ';
*p++ = '?';