diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-21 16:13:32 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-21 16:13:32 +0000 |
commit | d9d60e8c1258bda8f730a91c78458622034909a5 (patch) | |
tree | 52ff4fcd7d032590e609f46d774ec2a05cf21792 /io.c | |
parent | 9cd654ea2645598d088eb6e54c6957084bb2966d (diff) | |
download | ruby-d9d60e8c1258bda8f730a91c78458622034909a5.tar.gz |
* ext/zlib/zlib.c (zstream_shift_buffer): should restore class
field of a buffer. [ruby-dev:24562]
* eval.c (rb_alias): should warn on method discarding.
[ruby-dev:24546]
* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
string buffer by clearing klass. [ruby-dev:24548]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1132,11 +1132,13 @@ io_readpartial(argc, argv, io) READ_CHECK(fptr->f); if (RSTRING(str)->len != len) { + modified: rb_raise(rb_eRuntimeError, "buffer string modified"); } n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f); if (n <= 0) { again: + if (RSTRING(str)->len != len) goto modified; TRAP_BEG; n = read(fileno(fptr->f), RSTRING(str)->ptr, len); TRAP_END; |