(Fchar_before): Do range check before decrement.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/editfns.c b/src/editfns.c
index c8a6506e493..c12ea5ac3bb 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -610,18 +610,17 @@ is returned as a character.")
       n = XINT (pos);
     }
 
+  if (n <= BEGV || n > ZV)
+    return Qnil;
+
   if (!NILP (current_buffer->enable_multibyte_characters))
     {
       DEC_POS (n);
-      if (n < BEGV || n >= ZV)
-        return Qnil;
       XSETFASTINT (val, FETCH_CHAR (n));
     }
   else
     {
       n--;
-      if (n < BEGV || n >= ZV)
-        return Qnil;
       XSETFASTINT (val, FETCH_BYTE (n));
     }
    return val;