diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-18 04:38:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-18 04:38:01 +0000 |
commit | f5052d45be1b564a683c347dd72fd2f7b8638fd8 (patch) | |
tree | 0a1b9c32f17af390e4d7405892de0ec473dc56e7 /string.c | |
parent | 80aa1e6218305b2f75c47af368506a7f930f1214 (diff) | |
download | ruby-f5052d45be1b564a683c347dd72fd2f7b8638fd8.tar.gz |
string.c: check just before modification
* 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
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 3 |
1 files changed, 2 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; |