kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dir.c: check unknown keywords

Browse source 
* dir.c (dir_initialize): check unknown keywords.  [ruby-dev:47152]
  [Bug #8060]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-30 12:22:20 +00:00
parent c683096c90
commit bf9c1d9818
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Nov 30 21:22:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_initialize): check unknown keywords. [ruby-dev:47152]
[Bug #8060]
Sat Nov 30 18:05:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Nov 30 18:05:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32ole/win32ole.c (hash2named_arg): correct declaration to fix * ext/win32ole/win32ole.c (hash2named_arg): correct declaration to fix

11
dir.c
View file

@ -424,17 +424,20 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
struct dir_data *dp; struct dir_data *dp;
rb_encoding *fsenc; rb_encoding *fsenc;
VALUE dirname, opt, orig; VALUE dirname, opt, orig;
static VALUE sym_enc; static ID keyword_ids[1];
if (!sym_enc) { if (!keyword_ids[0]) {
sym_enc = ID2SYM(rb_intern("encoding")); keyword_ids[0] = rb_intern("encoding");
} }
fsenc = rb_filesystem_encoding(); fsenc = rb_filesystem_encoding();
rb_scan_args(argc, argv, "1:", &dirname, &opt); rb_scan_args(argc, argv, "1:", &dirname, &opt);
if (!NIL_P(opt)) { if (!NIL_P(opt)) {
VALUE enc = rb_hash_aref(opt, sym_enc); VALUE enc;
rb_check_keyword_opthash(opt, keyword_ids, 0, 1);
enc = rb_hash_aref(opt, ID2SYM(keyword_ids[0]));
if (!NIL_P(enc)) { if (!NIL_P(enc)) {
fsenc = rb_to_encoding(enc); fsenc = rb_to_encoding(enc);
} }

7
test/ruby/test_dir.rb
View file

@ -200,6 +200,13 @@ class TestDir < Test::Unit::TestCase
end end
end end
def test_unknown_keywords
bug8060 = '[ruby-dev:47152] [Bug #8060]'
assert_raise_with_message(ArgumentError, /unknown keyword/, bug8060) do
Dir.open(@root, xawqij: "a") {}
end
end
def test_symlink def test_symlink
begin begin
["dummy", *?a..?z].each do |f| ["dummy", *?a..?z].each do |f|