diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 23 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 28 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Apr 20 08:04:37 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] + Mon Apr 19 22:43:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization. @@ -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); } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-04-20" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100420 -#define RUBY_PATCHLEVEL 253 +#define RUBY_PATCHLEVEL 254 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |