Fix bug #10159 with crashes in auto-complete package.

src/xdisp.c (next_overlay_string): Initialize it->end_charpos for
 the new overlay string.  Otherwise, the call to composition_compute_stop_pos
 in compute_stop_pos uses a wrong it->end_charpos value, and crashes because
 it runs off the end of the overlay string.
This commit is contained in:
Eli Zaretskii 2012-09-22 15:31:05 +03:00
parent bbe099e709
commit 589bd69b63
2 changed files with 6 additions and 0 deletions

View file

@ -1,3 +1,8 @@
2012-09-22 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (next_overlay_string): Initialize it->end_charpos for
the new overlay string. (Bug#10159)
2012-09-22 Paul Eggert <eggert@cs.ucla.edu>
* emacs.c (shut_down_emacs): Don't assume stderr is buffered,

View file

@ -5346,6 +5346,7 @@ next_overlay_string (struct it *it)
SET_TEXT_POS (it->current.string_pos, 0, 0);
it->method = GET_FROM_STRING;
it->stop_charpos = 0;
it->end_charpos = SCHARS (it->string);
if (it->cmp_it.stop_pos >= 0)
it->cmp_it.stop_pos = 0;
it->prev_stop = 0;