From 2bed2cdc7fc3c1c2705b5de739db6dd125bf0d03 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 21 Dec 2007 16:54:25 +0000 Subject: [PATCH] * io.c (io_ungetc): avoid buffer relocation, which might cause serious problem under concurrent situation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff81be4fac..b8f0048ef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 22 01:52:11 2007 Yukihiro Matsumoto + + * io.c (io_ungetc): avoid buffer relocation, which might cause + serious problem under concurrent situation. + Sat Dec 22 01:35:41 2007 Tanaka Akira * re.c (ARG_ENCODING_NONE): defined for /.../n option. diff --git a/io.c b/io.c index 659784a777..06a0c3aa23 100644 --- a/io.c +++ b/io.c @@ -310,16 +310,7 @@ io_ungetc(VALUE str, rb_io_t *fptr) 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;