summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-08-05 02:22:37 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-08-05 02:22:37 +0000
commitf177c73edb16a62a3e1a06368ede687c5a5c53ff (patch)
tree7a1ceecb949b07f735b376c9b6fee4d3a688ff33 /parse.y
parent11d5ad0b842283403377b98d3f494d00241398da (diff)
merge revision(s) 58561: [Backport #13540]
parse.y: make shared string modifiable * parse.y (dedent_string): ensure that the string is modifiable, not to set the length of shared string. [ruby-core:80987] [Bug #13540] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y6
1 files changed, 5 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index 13823c42ee..9160fcc576 100644
--- a/parse.y
+++ b/parse.y
@@ -6529,6 +6529,11 @@ dedent_string(VALUE string, int width)
break;
}
}
+ if (!i) return 0;
+ rb_str_modify(string);
+ str = RSTRING_PTR(string);
+ if (RSTRING_LEN(string) != len)
+ rb_fatal("literal string changed: %+"PRIsVALUE, string);
MEMMOVE(str, str + i, char, len - i);
rb_str_set_len(string, len - i);
return i;
@@ -6585,7 +6590,6 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width)
StringValue(input);
wid = NUM2UINT(width);
- rb_str_modify(input);
col = dedent_string(input, wid);
return INT2NUM(col);
}