1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_io_s_read): close the IO if an exception is raised on

Browse Source 
seeking. [ruby-core:27429]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-01-08 07:47:12 +00:00
parent 902b109465
commit ef6e53635a
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jan 8 14:06:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (rb_io_s_read): close the IO if an exception is raised on
seeking. [ruby-core:27429]
Fri Jan 8 13:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 8 13:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_symbol): dump no encoding for 7bit only coderange * marshal.c (w_symbol): dump no encoding for 7bit only coderange

25
io.c
View File

@ -7816,6 +7816,19 @@ io_s_read(struct foreach_arg *arg)
return io_read(arg->argc, arg->argv, arg->io); return io_read(arg->argc, arg->argv, arg->io);
} }
struct seek_arg {
VALUE io;
VALUE offset;
int mode;
};
static VALUE
seek_before_read(struct seek_arg *arg)
{
rb_io_binmode(arg->io);
return rb_io_seek(arg->io, arg->offset, arg->mode);
}
/* /*
* call-seq: * call-seq:
* IO.read(name, [length [, offset]] ) => string * IO.read(name, [length [, offset]] ) => string
@ -7858,8 +7871,16 @@ rb_io_s_read(int argc, VALUE *argv, VALUE io)
open_key_args(argc, argv, &arg); open_key_args(argc, argv, &arg);
if (NIL_P(arg.io)) return Qnil; if (NIL_P(arg.io)) return Qnil;
if (!NIL_P(offset)) { if (!NIL_P(offset)) {
rb_io_binmode(arg.io); struct seek_arg sarg;
rb_io_seek(arg.io, offset, SEEK_SET); int state = 0;
sarg.io = arg.io;
sarg.offset = offset;
sarg.mode = SEEK_SET;
rb_protect((VALUE (*)(VALUE))seek_before_read, (VALUE)&sarg, &state);
if (state) {
rb_io_close(arg.io);
rb_jump_tag(state);
}
if (arg.argc == 2) arg.argc = 1; if (arg.argc == 2) arg.argc = 1;
} }
return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io); return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);