summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-21 15:57:56 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-21 15:57:56 +0000
commit31ccc99d6295dfd6da71728592f7ea48cd809d60 (patch)
tree04bc59aef8466f5e085d3b7c31a18dc4835db52c /parse.y
parentbb9a770cf34c9a6918fbc1ca6830c93ef3aa27a0 (diff)
merge revision(s) 61862: [Backport #14368]
parse.y (new_regexp): Fix SEGV of `/#{"\u3042"}#{'{U+3044}'}/` 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_4@62880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y3
1 files changed, 1 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 8e50087c26..ec2b056358 100644
--- a/parse.y
+++ b/parse.y
@@ -9141,8 +9141,7 @@ new_regexp_gen(struct parser_params *parser, NODE *node, int options)
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;