kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error

Browse source 
occurs in initilizing.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-12-14 04:36:14 +00:00
parent cba0d62d91
commit dcca25f003
2 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Dec 14 13:34:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error
occurs in initilizing.
Tue Dec 14 13:04:16 2010 NARUSE, Yui <naruse@ruby-lang.org> Tue Dec 14 13:04:16 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (Net::HTTPRequest#send_request_body_data): * lib/net/http.rb (Net::HTTPRequest#send_request_body_data):

53
ext/zlib/zlib.c
View file

@ -2456,6 +2456,19 @@ get_gzfile(VALUE obj)
*/ */
typedef struct {
int argc;
VALUE *argv;
VALUE klass;
} new_wrap_arg_t;
static VALUE
new_wrap(VALUE tmp)
{
new_wrap_arg_t *arg = (new_wrap_arg_t *)tmp;
return rb_class_new_instance(arg->argc, arg->argv, arg->klass);
}
static VALUE static VALUE
gzfile_ensure_close(VALUE obj) gzfile_ensure_close(VALUE obj)
{ {
@ -2468,6 +2481,35 @@ gzfile_ensure_close(VALUE obj)
return Qnil; return Qnil;
} }
static VALUE
gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
{
VALUE obj;
if (close_io_on_error) {
int state = 0;
new_wrap_arg_t arg;
arg.argc = argc;
arg.argv = argv;
arg.klass = klass;
obj = rb_protect(new_wrap, (VALUE)&arg, &state);
if (state) {
rb_io_close(argv[0]);
rb_jump_tag(state);
}
}
else {
obj = rb_class_new_instance(argc, argv, klass);
}
if (rb_block_given_p()) {
return rb_ensure(rb_yield, obj, gzfile_ensure_close, obj);
}
else {
return obj;
}
}
/* /*
* call-seq: Zlib::GzipFile.wrap(io) { |gz| ... } * call-seq: Zlib::GzipFile.wrap(io) { |gz| ... }
* *
@ -2481,14 +2523,7 @@ gzfile_ensure_close(VALUE obj)
static VALUE static VALUE
rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass) rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
{ {
VALUE obj = rb_class_new_instance(argc, argv, klass); return gzfile_wrap(argc, argv, klass, 0);
if (rb_block_given_p()) {
return rb_ensure(rb_yield, obj, gzfile_ensure_close, obj);
}
else {
return obj;
}
} }
/* /*
@ -2505,7 +2540,7 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
filename = argv[0]; filename = argv[0];
io = rb_file_open_str(filename, mode); io = rb_file_open_str(filename, mode);
argv[0] = io; argv[0] = io;
return rb_gzfile_s_wrap(argc, argv, klass); return gzfile_wrap(argc, argv, klass, 1);
} }
/* /*