(to_multibyte): Fix computation of new read_buffer_size.

diff --git a/src/ChangeLog b/src/ChangeLog
index ba97028618a6664124d421a9c7491b2eb59e236e..fb2b72071d84db71732333c735275ac9cf496691 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-31  Gerd Moellmann  <gerd@gnu.org>
 
+       * lread.c (to_multibyte): Fix computation of new read_buffer_size.
+
        * xfaces.c (realize_x_face): If C is not a single-byte character,
        set the face's colors_copied_bitwise_p instead of the defaulted_p
        members which have a different meaning.

diff --git a/src/lread.c b/src/lread.c
index 93fe9a9672fe3b3f5f698d94ffd6028872248bde..be0ecb64445b5a0c5a3df0c2f71f68ce33263aba 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1793,7 +1793,7 @@ to_multibyte (p, end, nchars)
   if (read_buffer_size < 2 * nbytes)
     {
       int offset = *p - read_buffer;
-      read_buffer_size *= 2;
+      read_buffer_size = 2 * max (read_buffer_size, nbytes);
       read_buffer = (char *) xrealloc (read_buffer, read_buffer_size);
       *p = read_buffer + offset;
       *end = read_buffer + read_buffer_size;