summaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 16:54:25 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 16:54:25 +0000
commit896c1acd5a6e980e2a4d87472c586da3ee8d0cfe (patch)
tree695ce484660cfbee18a3a7e2ebf20b825c55a0b6 /io.c
parentd5683d559f45f0f321e7917f71d3258e5deecfdc (diff)
downloadruby-896c1acd5a6e980e2a4d87472c586da3ee8d0cfe.tar.gz
ruby-896c1acd5a6e980e2a4d87472c586da3ee8d0cfe.tar.xz
ruby-896c1acd5a6e980e2a4d87472c586da3ee8d0cfe.zip
* io.c (io_ungetc): avoid buffer relocation, which might cause
serious problem under concurrent situation. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/io.c b/io.c
index 659784a77..06a0c3aa2 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;