ruby-changes:50788
From: usa <ko1@a...>
Date: Wed, 28 Mar 2018 19:25:02 +0900 (JST)
Subject: [ruby-changes:50788] usa:r62994 (ruby_2_3): merge revision(s) 62989:
usa 2018-03-28 19:24:57 +0900 (Wed, 28 Mar 2018) New Revision: 62994 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62994 Log: merge revision(s) 62989: dir.c: check NUL bytes * dir.c (GlobPathValue): should be used in rb_push_glob only. other methods should use FilePathValue. https://hackerone.com/reports/302338 * dir.c (rb_push_glob): expand GlobPathValue Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/ChangeLog branches/ruby_2_3/dir.c branches/ruby_2_3/test/ruby/test_dir.rb branches/ruby_2_3/version.h Index: ruby_2_3/ChangeLog =================================================================== --- ruby_2_3/ChangeLog (revision 62993) +++ ruby_2_3/ChangeLog (revision 62994) @@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1 +Wed Mar 28 19:24:20 2018 Nobuyoshi Nakada <nobu@r...> + + dir.c: check NUL bytes + + * dir.c (GlobPathValue): should be used in rb_push_glob only. + other methods should use FilePathValue. + https://hackerone.com/reports/302338 + + * dir.c (rb_push_glob): expand GlobPathValue + Wed Mar 28 18:04:37 2018 Eric Wong <normalperson@y...> webrick: prevent response splitting and header injection Index: ruby_2_3/dir.c =================================================================== --- ruby_2_3/dir.c (revision 62993) +++ ruby_2_3/dir.c (revision 62994) @@ -449,15 +449,6 @@ static const rb_data_type_t dir_data_typ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/dir.c#L449 static VALUE dir_close(VALUE); -#define GlobPathValue(str, safe) \ - /* can contain null bytes as separators */ \ - (!RB_TYPE_P((str), T_STRING) ? \ - (void)FilePathValue(str) : \ - (void)(check_safe_glob((str), (safe)), \ - check_glob_encoding(str), (str))) -#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0) -#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding())) - static VALUE dir_s_alloc(VALUE klass) { @@ -506,7 +497,7 @@ dir_initialize(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_3/dir.c#L497 } } - GlobPathValue(dirname, FALSE); + FilePathValue(dirname); orig = rb_str_dup_frozen(dirname); dirname = rb_str_encode_ospath(dirname); dirname = rb_str_dup_frozen(dirname); @@ -2185,7 +2176,14 @@ rb_push_glob(VALUE str, int flags) /* '\ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/dir.c#L2176 long offset = 0; VALUE ary; - GlobPathValue(str, TRUE); + /* can contain null bytes as separators */ + if (!RB_TYPE_P((str), T_STRING)) { + FilePathValue(str); + } + else { + rb_check_safe_obj(str); + rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding())); + } ary = rb_ary_new(); while (offset < RSTRING_LEN(str)) { @@ -2215,7 +2213,7 @@ dir_globs(long argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_3/dir.c#L2213 for (i = 0; i < argc; ++i) { int status; VALUE str = argv[i]; - GlobPathValue(str, TRUE); + FilePathValue(str); status = push_glob(ary, str, flags); if (status) GLOB_JUMP_TAG(status); } Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 62993) +++ ruby_2_3/version.h (revision 62994) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 450 +#define RUBY_PATCHLEVEL 451 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_3/test/ruby/test_dir.rb =================================================================== --- ruby_2_3/test/ruby/test_dir.rb (revision 62993) +++ ruby_2_3/test/ruby/test_dir.rb (revision 62994) @@ -156,6 +156,9 @@ class TestDir < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_dir.rb#L156 open(File.join(@root, "}}a"), "wb") {} assert_equal(%w(}}{} }}a).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '}}{\{\},a}'))) assert_equal(%w(}}{} }}a b c).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '{\}\}{\{\},a},b,c}'))) + assert_raise(ArgumentError) { + Dir.glob([[@root, File.join(@root, "*")].join("\0")]) + } end def test_glob_recursive @@ -191,10 +194,12 @@ class TestDir < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_dir.rb#L194 def test_entries assert_entries(Dir.open(@root) {|dir| dir.entries}) + assert_raise(ArgumentError) {Dir.entries(@root+"\0")} end def test_foreach assert_entries(Dir.foreach(@root).to_a) + assert_raise(ArgumentError) {Dir.foreach(@root+"\0").to_a} end def test_dir_enc Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 62993) +++ ruby_2_3 (revision 62994) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r62989 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/