2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 75b9327247c..ee582c4e4a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
         * fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
         Use much-faster test for byte-length change.
+        Don't assume string byte-length fits in 'int'.
 
         * alloc.c (Fmake_bool_vector): Avoid unnecessary multiplication.
 
diff --git a/src/fns.c b/src/fns.c
index c308e06101f..51b753b3134 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2169,7 +2169,7 @@ ARRAY is a vector, string, char-table, or bool-vector.  */)
           unsigned char str[MAX_MULTIBYTE_LENGTH];
           int len = CHAR_STRING (charval, str);
           EMACS_INT size_byte = SBYTES (array);
-          int i;
+          EMACS_INT i;
 
           if (INT_MULTIPLY_OVERFLOW (SCHARS (array), len)
               || SCHARS (array) * len != size_byte)