diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:27:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:27:07 +0000 |
commit | a583f4206210cfccd9228d6f1f0cef0f2fdb5b92 (patch) | |
tree | 3dce7af46eda64a3cbba90a43f76a4f26d21c5a8 | |
parent | 7b4f0c0d1d4815807b000506cb470eb925834f9d (diff) |
file.c: ASCII-compatible
* file.c (rb_file_join): check nul-byte only for strings, since
FilePathStringValue() does it. [ruby-core:48012] [Bug #7168]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 4 | ||||
-rw-r--r-- | test/ruby/test_file_exhaustive.rb | 12 |
3 files changed, 18 insertions, 3 deletions
@@ -1,4 +1,7 @@ -Tue Oct 16 10:54:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Oct 16 11:27:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_join): check nul-byte only for strings, since + FilePathStringValue() does it. [ruby-core:48012] [Bug #7168] * file.c (rb_file_join): path names must be ASCII-compatible. [ruby-core:48012] [Bug #7168] @@ -3941,6 +3941,7 @@ rb_file_join(VALUE ary, VALUE sep) tmp = RARRAY_PTR(ary)[i]; switch (TYPE(tmp)) { case T_STRING: + StringValueCStr(tmp); break; case T_ARRAY: if (ary == tmp) { @@ -3957,8 +3958,7 @@ rb_file_join(VALUE ary, VALUE sep) default: FilePathStringValue(tmp); } - name = StringValueCStr(result); - len = RSTRING_LEN(result); + RSTRING_GETMEM(result, name, len); if (i == 0) { rb_enc_copy(result, tmp); } diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index f697488192..10d04ddf15 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -793,6 +793,18 @@ class TestFileExhaustive < Test::Unit::TestCase bug7168 = '[ruby-core:48012]' names = %w"a b".map {|s| s.encode(Encoding::UTF_16LE)} assert_raise(Encoding::CompatibilityError, bug7168) {File.join(*names)} + assert_raise(Encoding::CompatibilityError, bug7168) {File.join(names)} + + a = Object.new + b = names[1] + names = [a, "b"] + a.singleton_class.class_eval do + define_method(:to_path) do + names[1] = b + "a" + end + end + assert_raise(Encoding::CompatibilityError, bug7168) {File.join(names)} end def test_truncate |