diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 13:30:09 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 13:30:09 +0000 |
commit | 17248a467e6af5e1c55c91668c2fe2fae9b6d54d (patch) | |
tree | a9d2ea851079c628e6b4b88dd2a3f85f83caaaef | |
parent | 441be3ca066e92f83f5db5fcc6a1ae311ca3d57e (diff) |
* io.c (argf_external_encoding, argf_internal_encoding): fix SEGV by
ARGF.external_encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu May 29 22:29:39 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * io.c (argf_external_encoding, argf_internal_encoding): fix SEGV by + ARGF.external_encoding. + Wed May 28 18:05:28 2008 Akinori MUSHA <knu@iDaemons.org> * array.c (rb_ary_nitems, Init_Array): Axe Array#nitems(). @@ -6942,13 +6942,19 @@ rb_io_set_encoding(int argc, VALUE *argv, VALUE io) static VALUE argf_external_encoding(VALUE argf) { - return rb_io_external_encoding(current_file); + if (!RTEST(current_file)) { + return rb_enc_from_encoding(rb_default_external_encoding()); + } + return rb_io_external_encoding(rb_io_check_io(current_file)); } static VALUE argf_internal_encoding(VALUE argf) { - return rb_io_internal_encoding(current_file); + if (!RTEST(current_file)) { + return rb_enc_from_encoding(rb_default_external_encoding()); + } + return rb_io_internal_encoding(rb_io_check_io(current_file)); } static VALUE |