diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 09:22:06 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 09:22:06 +0000 |
commit | b12a9cfb59c4978d773cc13eee7987cc49c741b4 (patch) | |
tree | 8679a864f56223b18b82e5250917ed2ab216be96 | |
parent | 57008f89579d15db842f733db6f7ef8328a051b5 (diff) |
merge revision(s) 37163:
* file.c (rb_get_path_check): path name must not contain NUL bytes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 3 | ||||
-rw-r--r-- | test/ruby/test_file.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Oct 12 18:19:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_get_path_check): path name must not contain NUL bytes. + Fri Oct 12 17:51:43 2012 Shugo Maeda <shugo@ruby-lang.org> * error.c (exc_to_s, name_err_to_s, name_err_mesg_to_str): do not @@ -176,6 +176,9 @@ rb_get_path_check(VALUE obj, int level) rb_raise(rb_eEncCompatError, "path name must be ASCII-compatible (%s): %s", rb_enc_name(enc), RSTRING_PTR(tmp)); } + + StringValueCStr(tmp); + return rb_str_new4(tmp); } diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index 26f68df958..b888233bbe 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -260,4 +260,14 @@ class TestFile < Test::Unit::TestCase assert_equal(File.chmod(0666, file), 1, bug5671) end end + + def test_open_nul + Dir.mktmpdir(__method__.to_s) do |tmpdir| + path = File.join(tmpdir, "foo") + assert_raise(ArgumentError) do + open(path + "\0bar", "w") {} + end + refute File.exist?(path) + end + end end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 285 +#define RUBY_PATCHLEVEL 286 #define RUBY_RELEASE_DATE "2012-10-12" #define RUBY_RELEASE_YEAR 2012 |