* 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
This commit is contained in:
parent
2ed1cdbb0d
commit
6299619da9
|
@ -1,3 +1,11 @@
|
|||
Thu Oct 7 12:55:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* 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]
|
||||
|
||||
Thu Oct 7 02:56:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/stringio/stringio.c: use FMODE_APPEND.
|
||||
|
|
2
io.c
2
io.c
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue