From 9eb9fbf5f12fba7511481d0cabb25a2020d7b710 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Tue, 22 May 2018 10:32:40 +0200 Subject: [PATCH] Fix heap buffer overflow in lit_utf_incr (#2345) This patch fixes #2344. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- jerry-core/parser/regexp/re-parser.c | 5 ++++- tests/jerry/fail/regression-test-issue-2344.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/fail/regression-test-issue-2344.js diff --git a/jerry-core/parser/regexp/re-parser.c b/jerry-core/parser/regexp/re-parser.c index ffd274b9f..3c7a35cca 100644 --- a/jerry-core/parser/regexp/re-parser.c +++ b/jerry-core/parser/regexp/re-parser.c @@ -262,7 +262,10 @@ re_count_num_of_groups (re_parser_ctx_t *parser_ctx_p) /**< RegExp parser contex { case LIT_CHAR_BACKSLASH: { - lit_utf8_incr (&curr_p); + if (curr_p < parser_ctx_p->input_end_p) + { + lit_utf8_incr (&curr_p); + } break; } case LIT_CHAR_LEFT_SQUARE: diff --git a/tests/jerry/fail/regression-test-issue-2344.js b/tests/jerry/fail/regression-test-issue-2344.js new file mode 100644 index 000000000..6d8364f0b --- /dev/null +++ b/tests/jerry/fail/regression-test-issue-2344.js @@ -0,0 +1,16 @@ +// 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. + + +new RegExp().compile("\\1\\");