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

string.c: check just before modification

Browse Source 
* string.c (rb_str_chomp_bang): check if modifiable after checking
  an argument and just before modification, as it can get frozen
  during the argument conversion to String.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-18 04:38:01 +00:00
parent 80aa1e6218
commit f5052d45be
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
string.c
View File

@ -8255,6 +8255,7 @@ rb_str_chomp_string(VALUE str, VALUE rs)
long olen = RSTRING_LEN(str); long olen = RSTRING_LEN(str);
long len = chompped_length(str, rs); long len = chompped_length(str, rs);
if (len >= olen) return Qnil; if (len >= olen) return Qnil;
str_modify_keep_cr(str);
STR_SET_LEN(str, len); STR_SET_LEN(str, len);
TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str)); TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str));
if (ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) { if (ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) {
@ -8275,7 +8276,7 @@ static VALUE
rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
{ {
VALUE rs; VALUE rs;
str_modify_keep_cr(str); str_modifiable(str);
if (RSTRING_LEN(str) == 0) return Qnil; if (RSTRING_LEN(str) == 0) return Qnil;
rs = chomp_rs(argc, argv); rs = chomp_rs(argc, argv);
if (NIL_P(rs)) return Qnil; if (NIL_P(rs)) return Qnil;

8
test/ruby/test_string.rb
View File

@ -444,6 +444,14 @@ CODE
s = S("").freeze s = S("").freeze
assert_raise_with_message(RuntimeError, /frozen/) {s.chomp!} assert_raise_with_message(RuntimeError, /frozen/) {s.chomp!}
s = S("ax")
o = Struct.new(:s).new(s)
def o.to_str
s.freeze
"x"
end
assert_raise_with_message(RuntimeError, /frozen/) {s.chomp!(o)}
ensure ensure
$/ = save $/ = save
end end