From 607e6058442b10dda72094a21eaba506ef7f43b1 Mon Sep 17 00:00:00 2001 From: Szilard Ledan Date: Wed, 31 Jan 2018 09:27:32 +0100 Subject: [PATCH] Fix regex brackets matching bug (#2179) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2178. JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu JerryScript-DCO-1.0-Signed-off-by: Szilard Ledan szledan@inf.u-szeged.hu --- jerry-core/parser/regexp/re-parser.c | 3 ++- tests/jerry/regression-test-issue-2178.js | 25 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/regression-test-issue-2178.js diff --git a/jerry-core/parser/regexp/re-parser.c b/jerry-core/parser/regexp/re-parser.c index 0046acea2..0af0589e5 100644 --- a/jerry-core/parser/regexp/re-parser.c +++ b/jerry-core/parser/regexp/re-parser.c @@ -318,7 +318,8 @@ re_parse_char_class (re_parser_ctx_t *parser_ctx_p, /**< number of classes */ bool is_range = false; parser_ctx_p->num_of_classes = 0; - if (lit_utf8_peek_prev (parser_ctx_p->input_curr_p) != LIT_CHAR_LEFT_SQUARE) + const ecma_char_t prev_char = lit_utf8_peek_prev (parser_ctx_p->input_curr_p); + if (prev_char != LIT_CHAR_LEFT_SQUARE && prev_char != LIT_CHAR_CIRCUMFLEX) { lit_utf8_decr (&parser_ctx_p->input_curr_p); lit_utf8_decr (&parser_ctx_p->input_curr_p); diff --git a/tests/jerry/regression-test-issue-2178.js b/tests/jerry/regression-test-issue-2178.js new file mode 100644 index 000000000..3f781ce65 --- /dev/null +++ b/tests/jerry/regression-test-issue-2178.js @@ -0,0 +1,25 @@ +// Copyright JS Foundation and other contributors, http://js.foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Testcase from bugreport (issue: #2178). +bad = "'detailForm','detailForm:j_id166', []);\" >\"Export\n" +good = "'detailForm','detailForm:j_id166');\" >\"Export\n" +r = /'(detailForm:j_id\d+)'[^>]+>[^>]+Export to XLS format/; +assert(!!good.match(r) && !!bad.match(r)); + +// Similar testcases. +var regexPatternCharacters = ['^', '$', '\\', '.', '*', '+', '?', '(', ')', '[', ']', '{', '}']; +regexPatternCharacters.forEach(function (str) { + assert(str.match(/[^>]/) == str); +})