(bidi_init_it): Set bidi_it->ch_len even if POS > 0.

diff --git a/src/bidi.c b/src/bidi.c
index c07312639a76f8c234b6ac3f8167287950249bf7..4f7099237be9a36e42104322cfec8eb4c20a3e9e 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -837,7 +837,12 @@ bidi_init_it (int pos, bidi_dir_t dir, struct bidi_it *bidi_it)
       bidi_it->ch_len = 1;     /* so that incrementing bytepos works */
     }
   else
-    bidi_it->bytepos = CHAR_TO_BYTE (pos);
+    {
+      bidi_it->bytepos = CHAR_TO_BYTE (pos);
+      bidi_it->ch_len
+       = MULTIBYTE_FORM_LENGTH (BYTE_POS_ADDR (bidi_it->bytepos),
+                                MAX_MULTIBYTE_LENGTH);
+    }
   bidi_it->ch = '\x1d';         /* FIXME: should be U+2029 */
   bidi_it->type = NEUTRAL_B;
   bidi_it->orig_type = UNKNOWN_BT;