From cf924a05e0524d0bb5cf61c2378fee6757c787fb Mon Sep 17 00:00:00 2001 From: mame Date: Tue, 16 Jan 2018 01:43:25 +0000 Subject: [PATCH] =?UTF-8?q?parse.y=20(new=5Fregexp):=20Fix=20SEGV=20of=20`?= =?UTF-8?q?/#{"\u3042"}#{'=E3=81=84'}/`=20in=20non=20UTF-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- parse.y | 3 +-- test/ruby/test_mixed_unicode_escapes.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/parse.y b/parse.y index dd34b4a9c4..92c0c875e6 100644 --- a/parse.y +++ b/parse.y @@ -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)) { VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit; if (!literal_concat0(p, lit, tail)) { - node = 0; - break; + return NEW_NIL(loc); /* dummy node on error */ } rb_str_resize(tail, 0); prev->nd_next = list->nd_next; diff --git a/test/ruby/test_mixed_unicode_escapes.rb b/test/ruby/test_mixed_unicode_escapes.rb index 09240d8ab2..f0b4cc691f 100644 --- a/test/ruby/test_mixed_unicode_escapes.rb +++ b/test/ruby/test_mixed_unicode_escapes.rb @@ -13,14 +13,18 @@ class TestMixedUnicodeEscape < Test::Unit::TestCase # 8-bit character escapes are okay. 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("\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 # 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("é#{nil}\u1234")} - end end