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 (new_regexp): Fix SEGV of /#{"\u3042"}#{'い'}/ in non UTF-8

Browse source 
Mixing other encoding string literals in one Regexp caused SEGV.
This bug was found by CoverityScan.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-16 01:43:25 +00:00
parent fb1172bcf6
commit cf924a05e0
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
parse.y
View file

@ -8993,8 +8993,7 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) { if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) {
VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit; VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit;
if (!literal_concat0(p, lit, tail)) { if (!literal_concat0(p, lit, tail)) {
node = 0; return NEW_NIL(loc); /* dummy node on error */
break;
} }
rb_str_resize(tail, 0); rb_str_resize(tail, 0);
prev->nd_next = list->nd_next; prev->nd_next = list->nd_next;

8
test/ruby/test_mixed_unicode_escapes.rb
View file

@ -13,14 +13,18 @@ class TestMixedUnicodeEscape < Test::Unit::TestCase
# 8-bit character escapes are okay. # 8-bit character escapes are okay.
assert_equal("B\xFF", "\u0042\xFF") assert_equal("B\xFF", "\u0042\xFF")
# sjis mb chars mixed with Unicode shound not work # sjis mb chars mixed with Unicode should not work
assert_raise(SyntaxError) { eval %q("é<>\u1234")} assert_raise(SyntaxError) { eval %q("é<>\u1234")}
assert_raise(SyntaxError) { eval %q("\u{1234}é<>")} assert_raise(SyntaxError) { eval %q("\u{1234}é<>")}
# also should not work for Regexp
assert_raise(SyntaxError) { eval %q(/#{"\u1234"}#{"é<>"}/)}
assert_raise(RegexpError) { eval %q(/\u{1234}#{nil}é<>/)}
assert_raise(RegexpError) { eval %q(/é<>#{nil}\u1234/)}
# String interpolation turns into an expression and we get # String interpolation turns into an expression and we get
# a different kind of error, but we still can't mix these # a different kind of error, but we still can't mix these
assert_raise(Encoding::CompatibilityError) { eval %q("\u{1234}#{nil}é<>")} assert_raise(Encoding::CompatibilityError) { eval %q("\u{1234}#{nil}é<>")}
assert_raise(Encoding::CompatibilityError) { eval %q("é<>#{nil}\u1234")} assert_raise(Encoding::CompatibilityError) { eval %q("é<>#{nil}\u1234")}
end end
end end