file.c: poisoned NUL

nobu · nobu · commit 7085db45e4f1 · 2012-10-12T09:18:07.000Z
* file.c (rb_get_path_check): path name must not contain NUL bytes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 12 18:18:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path_check): path name must not contain NUL bytes.
+
 Fri Oct 12 16:06:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* tool/merger.rb: now can merge revision(s) without --ticket again.
diff --git a/file.c b/file.c
@@ -184,6 +184,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
@@ -349,4 +349,14 @@ def test_long_unc
       end
     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
+      assert_file_not(:exist?, path)
+    end
+  end
 end

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +Fri Oct 12 18:18:03 2012  Nobuyoshi Nakada  <[email protected]>
++
 +	* file.c (rb_get_path_check): path name must not contain NUL bytes.
++
 Fri Oct 12 16:06:20 2012  NAKAMURA Usaku  <[email protected]>
 	* tool/merger.rb: now can merge revision(s) without --ticket again.
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,9 @@ rb_get_path_check(VALUE obj, int level)`
`184`	`184`	`rb_raise(rb_eEncCompatError, "path name must be ASCII-compatible (%s): %s",`
`185`	`185`	`rb_enc_name(enc), RSTRING_PTR(tmp));`
`186`	`186`	`}`
	`187`	`+`
	`188`	`+ StringValueCStr(tmp);`
	`189`	`+`
`187`	`190`	`return rb_str_new4(tmp);`
`188`	`191`	`}`
`189`	`192`