From 86613d13d5f576f2a84413f04297ed3f4e2c25e1 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 22 Feb 2018 22:04:35 +0000 Subject: merge revision(s) 61862: [Backport #14368] parse.y (new_regexp): Fix SEGV of `/#{"\u3042"}#{'?'}/` in non UTF-8 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/branches/ruby_2_5@62539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 3 +-- test/ruby/test_mixed_unicode_escapes.rb | 8 ++++++-- version.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/parse.y b/parse.y index c2a8be996b..6b74a63891 100644 --- a/parse.y +++ b/parse.y @@ -9485,8 +9485,7 @@ new_regexp_gen(struct parser_params *parser, NODE *node, int options, const YYLT if (reg_fragment_check(tail, options) && prev && !NIL_P(prev->nd_lit)) { VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit; if (!literal_concat0(parser, lit, tail)) { - node = 0; - break; + return NEW_NIL(); /* 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 diff --git a/version.h b/version.h index 3eb2a6ebdd..6bdf2f7b06 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.0" #define RUBY_RELEASE_DATE "2018-02-23" -#define RUBY_PATCHLEVEL 32 +#define RUBY_PATCHLEVEL 33 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.3