diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-05-30 22:01:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-05-30 22:01:51 +0300 |
| commit | 6dcfd2538373529448f593d22708917bc03b6bbd (patch) | |
| tree | edc8915f4388ce0491d56705b59e9a87c1b2b0af /src/bidi.c | |
| parent | 61a0807183d810cfb2cfe289cea050c9223f6b58 (diff) | |
| download | emacs-6dcfd2538373529448f593d22708917bc03b6bbd.tar.gz | |
Fix crash reported in bug #6306.
bidi.c (bidi_move_to_visually_next): Make sure the sentinel
state is always cached.
Diffstat (limited to 'src/bidi.c')
| -rw-r--r-- | src/bidi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/bidi.c b/src/bidi.c index bdeccfee97c..a25976dcc01 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -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 |