matz	2007-09-25 21:45:03 +0900 (Tue, 25 Sep 2007)

  New Revision: 13512

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_knownbug.rb
    trunk/io.c

  Log:
    * io.c (io_ungetc): reallocate internal buffer if pushing data
      excess capacity.  [ruby-dev:31650]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13512&r2=13511
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=13512&r2=13511
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bootstraptest/test_knownbug.rb?r1=13512&r2=13511

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13511)
+++ ChangeLog	(revision 13512)
@@ -1,3 +1,8 @@
+Tue Sep 25 15:11:32 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (io_ungetc): reallocate internal buffer if pushing data
+	  excess capacity.  [ruby-dev:31650]
+
 Tue Sep 25 13:43:03 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* eval_method.ci (remove_method): should not remove undef place
Index: bootstraptest/test_knownbug.rb
===================================================================
--- bootstraptest/test_knownbug.rb	(revision 13511)
+++ bootstraptest/test_knownbug.rb	(revision 13512)
@@ -6,11 +6,15 @@
 assert_equal 'ok', %q{
 begin
   r, w = IO.pipe
+  w.write "foo"
   w.close
   # assert_raise(IOError, "[ruby-dev:31650]") { 20000.times { r.ungetc "a" } }
+  r.getc
   20000.times { r.ungetc "a" }
-rescue IOError
-  :ok
+  data = r.read
+  if data.size == 20002 && data[-5..-1] == "aaaoo"
+    :ok
+  end
 ensure
   r.close
 end
Index: io.c
===================================================================
--- io.c	(revision 13511)
+++ io.c	(revision 13512)
@@ -296,20 +296,17 @@
 	    fptr->rbuf_capa = 8192;
         fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
     }
-    if (fptr->rbuf_off == 0) {
-        if (fptr->rbuf_len) {
-            MEMMOVE(fptr->rbuf+len, fptr->rbuf, char, fptr->rbuf_len);
-	}
-        fptr->rbuf_off = len;
-    }
-    else if (fptr->rbuf_off < len) {
+    if (fptr->rbuf_off < len) {
 	int capa = fptr->rbuf_len + len;
 	char *buf = ALLOC_N(char, capa);
 
         if (fptr->rbuf_len) {
             MEMMOVE(buf+len, fptr->rbuf+fptr->rbuf_off, char, fptr->rbuf_len);
 	}
+	fptr->rbuf_capa = capa;
 	fptr->rbuf_off = len;
+	free(fptr->rbuf);
+        fptr->rbuf = buf;
     }
     fptr->rbuf_off-=len;
     fptr->rbuf_len+=len;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml