diff options
| -rw-r--r-- | string.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -8255,6 +8255,7 @@ rb_str_chomp_string(VALUE str, VALUE rs) long olen = RSTRING_LEN(str); long len = chompped_length(str, rs); if (len >= olen) return Qnil; + str_modify_keep_cr(str); STR_SET_LEN(str, len); TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str)); if (ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) { @@ -8275,7 +8276,7 @@ static VALUE rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) { VALUE rs; - str_modify_keep_cr(str); + str_modifiable(str); if (RSTRING_LEN(str) == 0) return Qnil; rs = chomp_rs(argc, argv); if (NIL_P(rs)) return Qnil; diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index dc76b53810..0fd0538d00 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -444,6 +444,14 @@ CODE s = S("").freeze 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 $/ = save end |