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

Fix crash reported in bug #6306.

Browse source 
bidi.c (bidi_move_to_visually_next): Make sure the sentinel
 state is always cached.
This commit is contained in:
Eli Zaretskii 2010-05-30 22:01:51 +03:00
parent 61a0807183
commit 6dcfd25383
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-30 Eli Zaretskii <eliz@gnu.org>
* bidi.c (bidi_move_to_visually_next): Make sure the sentinel
state is always cached (bug#6306).
2010-05-29 Eli Zaretskii <eliz@gnu.org>
Fix cursor motion in bidi-reordered continued lines.

10
src/bidi.c
View file

@ -1907,7 +1907,9 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
if (!bidi_it->first_elt && bidi_it->orig_type == NEUTRAL_B)
bidi_line_init (bidi_it);
/* Prepare the sentinel iterator state. */
/* Prepare the sentinel iterator state, and cache it. When we bump
into it, scanning backwards, we'll know that the last non-base
level is exhausted. */
if (bidi_cache_idx == 0)
{
bidi_copy_it (&sentinel, bidi_it);
@ -1918,6 +1920,7 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
sentinel.ch = '\n'; /* doesn't matter, but why not? */
sentinel.ch_len = 1;
}
bidi_cache_iterator_state (&sentinel, 1);
}
old_level = bidi_it->resolved_level;
@ -1933,11 +1936,6 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
int incr = ascending ? 1 : -1;
int expected_next_level = old_level + incr;
/* If we don't have anything cached yet, we need to cache the
sentinel state, since we'll need it to record where to jump
when the last non-base level is exhausted. */
if (bidi_cache_idx == 0)
bidi_cache_iterator_state (&sentinel, 1);
/* Jump (or walk) to the other edge of this level. */
bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
/* Switch scan direction and peek at the next character in the