1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io.c: check null char

Browse Source 
* io.c (ruby_set_inplace_mode): check if null is contained.  based
  on the patch by tommy (Masahiro Tomita) in [ruby-dev:50272].
  [Bug #13960]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-02 06:46:42 +00:00
parent 85847e78a0
commit 8148b7013c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io.c
View File

@ -12224,10 +12224,10 @@ argf_inplace_mode_set(VALUE argf, VALUE val)
ARGF.inplace = 0; ARGF.inplace = 0;
} }
else { else {
StringValue(val); const char *suffix = StringValueCStr(val);
if (ARGF.inplace) free(ARGF.inplace); if (ARGF.inplace) free(ARGF.inplace);
ARGF.inplace = 0; ARGF.inplace = 0;
ARGF.inplace = strdup(RSTRING_PTR(val)); ARGF.inplace = strdup(suffix);
} }
return argf; return argf;
} }

6
test/ruby/test_argf.rb
View File

@ -310,6 +310,12 @@ class TestArgf < Test::Unit::TestCase
}; };
end end
def test_inplace_invalid_backup
assert_raise(ArgumentError, '[ruby-dev:50272] [Bug #13960]') {
ARGF.inplace_mode = "a\0"
}
end
def test_encoding def test_encoding
ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f| ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
{# {#