Merge from origin/emacs-24

[gnu-emacs] / src / bidi.c

diff --git a/src/bidi.c b/src/bidi.c
index cbc1820c2a5dfe3d67b5a4dca11dc0445540b49f..e5e08c6a25297cd39326d02306e7fe6b14d7aa79 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1799,6 +1799,11 @@ bidi_explicit_dir_char (int ch)
 
   if (!bidi_initialized)
     emacs_abort ();
+  if (ch < 0)
+    {
+      eassert (ch == BIDI_EOB);
+      return false;
+    }
   ch_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch));
   return (ch_type == LRE || ch_type == LRO
          || ch_type == RLE || ch_type == RLO