From 81899c9138d2412a6c9977cb6c47987ca622af27 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 27 May 2012 00:32:46 -0700 Subject: [PATCH] * bidi.c (bidi_mirror_char): Don't possibly truncate the integer before checking whether it's out of range. Put the check inside eassert. See . --- src/ChangeLog | 7 +++++++ src/bidi.c | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a9dae7f68a..b0b88a86e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-05-27 Paul Eggert + + * bidi.c (bidi_mirror_char): Don't possibly truncate the integer + before checking whether it's out of range. Put the check inside + eassert. See + . + 2012-05-27 Ken Brown * callproc.c (Fcall_process): Restore a line that was accidentally diff --git a/src/bidi.c b/src/bidi.c index efed9dd6cd..70274560dd 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -204,12 +204,8 @@ bidi_mirror_char (int c) val = CHAR_TABLE_REF (bidi_mirror_table, c); if (INTEGERP (val)) { - int v = XINT (val); - - if (v < 0 || v > MAX_CHAR) - abort (); - - return v; + eassert (CHAR_VALID_P (XINT (val))); + return XINT (val); } return c; -- 2.20.1