kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: make shared string modifiable

Browse source 
* 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/trunk@58561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-05-04 06:54:11 +00:00
parent 05e82555e1
commit 9133f6648d
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
parse.y
View file

@ -6392,6 +6392,11 @@ dedent_string(VALUE string, int width)
break; 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); MEMMOVE(str, str + i, char, len - i);
rb_str_set_len(string, len - i); rb_str_set_len(string, len - i);
return i; return i;
@ -6448,7 +6453,6 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width)
StringValue(input); StringValue(input);
wid = NUM2UINT(width); wid = NUM2UINT(width);
rb_str_modify(input);
col = dedent_string(input, wid); col = dedent_string(input, wid);
return INT2NUM(col); return INT2NUM(col);
} }

10
test/ruby/test_parse.rb
View file

@ -988,6 +988,16 @@ x = __ENCODING__
assert_equal(-100, e.backtrace_locations.first.lineno, bug) assert_equal(-100, e.backtrace_locations.first.lineno, bug)
end end
def test_file_in_indented_heredoc
name = '[ruby-core:80987] [Bug #13540]' # long enough to be shared
assert_equal(name+"\n", eval("#{<<-"begin;"}\n#{<<-'end;'}", nil, name))
begin;
<<~HEREDOC
#{__FILE__}
HEREDOC
end;
end
=begin =begin
def test_past_scope_variable def test_past_scope_variable
assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}} assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}