diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 16:54:25 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 16:54:25 +0000 |
commit | 2bed2cdc7fc3c1c2705b5de739db6dd125bf0d03 (patch) | |
tree | 695ce484660cfbee18a3a7e2ebf20b825c55a0b6 | |
parent | b82a05989e388a5d9500051ce91fd47f02aacbf9 (diff) | |
download | ruby-2bed2cdc7fc3c1c2705b5de739db6dd125bf0d03.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 11 |
2 files changed, 6 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sat Dec 22 01:52:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@fsij.org> * re.c (ARG_ENCODING_NONE): defined for /.../n option. @@ -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; |