From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 31 Oct 2001 13:33:56 +0000 (+0000)
Subject: (to_multibyte): Fix computation of new read_buffer_size.
X-Git-Tag: ttn-vms-21-2-B4~18958
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe957e65534a471aaa4e53468283981f8fafa953;p=emacs.git

(to_multibyte): Fix computation of new read_buffer_size.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ba97028618a..fb2b72071d8 100644
--- 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 93fe9a9672f..be0ecb64445 100644
--- 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;