[Emacs-diffs] /srv/bzr/emacs/trunk r110135: Fix bug #10159 with crashes in auto-complete package.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110135
fixes bug: http://debbugs.gnu.org/10159
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-22 15:31:05 +0300
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-22 07:34:52 +0000
+++ b/src/ChangeLog     2012-09-22 12:31:05 +0000
@@ -1,3 +1,8 @@
+2012-09-22  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (next_overlay_string): Initialize it->end_charpos for
+       the new overlay string.  (Bug#10159)
+
 2012-09-22  Paul Eggert  <address@hidden>
 
        * emacs.c (shut_down_emacs): Don't assume stderr is buffered,

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-09-21 03:03:48 +0000
+++ b/src/xdisp.c       2012-09-22 12:31:05 +0000
@@ -5346,6 +5346,7 @@
       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;