diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-07 04:06:41 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-07 04:06:41 +0000 |
commit | 6299619da97a74a4f0e303d069ab5fd1d781a79e (patch) | |
tree | e0a320235de1de0a41c1a6cec96ec3cfa52fbc4b /io.c | |
parent | 2ed1cdbb0da44d346fc57a4f583392a8636bfd6b (diff) | |
download | ruby-6299619da97a74a4f0e303d069ab5fd1d781a79e.tar.gz |
* pack.c (pack_unpack): string conversion should at the top of the
method. [ruby-dev:24439]
* io.c (io_read): buffer should be frozen only after the length
check. [ruby-dev:24440]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1195,10 +1195,10 @@ io_read(argc, argv, io) rb_str_modify(str); rb_str_resize(str,len); } - FL_SET(str, FL_FREEZE); if (len == 0) return str; READ_CHECK(fptr->f); + FL_SET(str, FL_FREEZE); n = rb_io_fread(RSTRING(str)->ptr, len, fptr->f); FL_UNSET(str, FL_FREEZE); if (n == 0) { |