diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | file.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Oct 16 14:56:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_join): need to check again after any conversion run. + [ruby-core:48012] [Bug #7168] + Tue Oct 16 12:52:14 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * test/ruby/envutil.rb (Test::Unit::Assertions#assert_file): @@ -3917,6 +3917,7 @@ rb_file_join(VALUE ary, VALUE sep) long len, i; VALUE result, tmp; const char *name, *tail; + int checked = TRUE; if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0); @@ -3942,6 +3943,7 @@ rb_file_join(VALUE ary, VALUE sep) tmp = RARRAY_PTR(ary)[i]; switch (TYPE(tmp)) { case T_STRING: + if (!checked) check_path_encoding(tmp); StringValueCStr(tmp); break; case T_ARRAY: @@ -3958,6 +3960,7 @@ rb_file_join(VALUE ary, VALUE sep) break; default: FilePathStringValue(tmp); + checked = FALSE; } RSTRING_GETMEM(result, name, len); if (i == 0) { |