* minibuf.c (Fread_buffer): Don't assume strlen fits in int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bff8e53fbddd5a05e42913dee600a5a0e0779d2..238e37a43a1b0087bf951245cfb8f45d248b1b40 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
 2011-06-20  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * minibuf.c (Fread_buffer):
        * lread.c (intern, intern_c_string):
        * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:
        Don't assume string length fits in int.

diff --git a/src/minibuf.c b/src/minibuf.c
index 1b555035cfe560109a4e7fde6f37e48db24db2ed..ca2f22df9edef6267b6099958e48122e1f9cf21e 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1115,7 +1115,7 @@ function, instead of the usual behavior.  */)
 {
   Lisp_Object args[4], result;
   char *s;
-  int len;
+  ptrdiff_t len;
   int count = SPECPDL_INDEX ();
 
   if (BUFFERP (def))
@@ -1137,7 +1137,7 @@ function, instead of the usual behavior.  */)
          if (STRINGP (prompt))
            {
              s = SSDATA (prompt);
-             len = strlen (s);
+             len = SBYTES (prompt);
              if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ')
                len = len - 2;
              else if (len >= 1 && (s[len - 1] == ':' || s[len - 1] == ' '))