diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 23:10:31 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 23:10:31 +0000 |
commit | d38975ac74a13fe1561851e1a193b86ea39a5a6d (patch) | |
tree | d053dcb158c139860dfc4c331a7f43adcb9fc69c /io.c | |
parent | 95d902d90d62e10bdd1c73bf70650ba01d026483 (diff) |
merge revision(s) 26252:
* io.c (rb_io_s_read): close the IO if an exception is raised on
seeking. [ruby-core:27429]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 23 |
1 files changed, 22 insertions, 1 deletions
@@ -5462,6 +5462,18 @@ io_s_read(arg) return io_read(arg->argc, &arg->sep, arg->io); } +struct seek_arg { + VALUE io; + VALUE offset; + int mode; +}; + +static VALUE +seek_before_read(struct seek_arg *arg) +{ + return rb_io_seek(arg->io, arg->offset, arg->mode); +} + /* * call-seq: * IO.read(name, [length [, offset]] ) => string @@ -5491,7 +5503,16 @@ rb_io_s_read(argc, argv, io) arg.io = rb_io_open(StringValueCStr(fname), "r"); if (NIL_P(arg.io)) return Qnil; if (!NIL_P(offset)) { - rb_io_seek(arg.io, offset, SEEK_SET); + struct seek_arg sarg; + 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); + } } return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io); } |