matz	2007-12-22 01:54:25 +0900 (Sat, 22 Dec 2007)

  New Revision: 14439

  Modified files:
    trunk/ChangeLog
    trunk/io.c

  Log:
    * io.c (io_ungetc): avoid buffer relocation, which might cause
      serious problem under concurrent situation.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14439&r2=14438
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=14439&r2=14438

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14438)
+++ ChangeLog	(revision 14439)
@@ -1,3 +1,8 @@
+Sat Dec 22 01:52:11 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (io_ungetc): avoid buffer relocation, which might cause
+	  serious problem under concurrent situation.
+
 Sat Dec 22 01:35:41 2007  Tanaka Akira  <akr@f...>
 
 	* re.c (ARG_ENCODING_NONE): defined for /.../n option.
Index: io.c
===================================================================
--- io.c	(revision 14438)
+++ io.c	(revision 14439)
@@ -310,16 +310,7 @@
         fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
     }
     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;
+	rb_raise(rb_eIOError, "ungetc failed");
     }
     fptr->rbuf_off-=len;
     fptr->rbuf_len+=len;

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