* alloc.c (Fmake_string): Check for out-of-range init.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 87259a083ae..6d163f56c1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c (Fmake_string): Check for out-of-range init.
+
 2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>
 
         * fns.c (Fputhash): Document return value.
diff --git a/src/alloc.c b/src/alloc.c
index cfbb79b2e61..db1744bc7cc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2186,9 +2186,9 @@ INIT must be an integer that represents a character.  */)
   EMACS_INT nbytes;
 
   CHECK_NATNUM (length);
-  CHECK_NUMBER (init);
+  CHECK_CHARACTER (init);
 
-  c = XINT (init);
+  c = XFASTINT (init);
   if (ASCII_CHAR_P (c))
     {
       nbytes = XINT (length);