From f3cd586094d5a1e8a5e4cb43d637d46975e6dc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20Osztrogon=C3=A1c?= <csaba.osztrogonac@h-lab.eu>
Date: Fri, 1 Oct 2021 12:56:53 +0200
Subject: [PATCH] Fix leaking lastIndex values in RegExp built-ins (#4787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #4781. This is a followup fix after #4166.

JerryScript-DCO-1.0-Signed-off-by: Csaba Osztrogonác csaba.osztrogonac@h-lab.eu
---
 .../ecma/operations/ecma-regexp-object.c      |  2 +-
 .../es.next/regression-test-issue-4781.js     | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/jerry/es.next/regression-test-issue-4781.js

diff --git a/jerry-core/ecma/operations/ecma-regexp-object.c b/jerry-core/ecma/operations/ecma-regexp-object.c
index 88a7969a0..9d2ca38d5 100644
--- a/jerry-core/ecma/operations/ecma-regexp-object.c
+++ b/jerry-core/ecma/operations/ecma-regexp-object.c
@@ -3496,7 +3496,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */
       last_index = ecma_make_length_value (index);
       ecma_value_t next_set_status = ecma_op_object_put (obj_p,
                                                          ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL),
-                                                         ecma_make_length_value (index),
+                                                         last_index,
                                                          true);
 #else /* !JERRY_ESNEXT */
       ecma_number_t index = ecma_get_number_from_value (last_index);
diff --git a/tests/jerry/es.next/regression-test-issue-4781.js b/tests/jerry/es.next/regression-test-issue-4781.js
new file mode 100644
index 000000000..fc74a37b0
--- /dev/null
+++ b/tests/jerry/es.next/regression-test-issue-4781.js
@@ -0,0 +1,38 @@
+// 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.
+
+function testAdvanceStringIndex(lastIndex) {
+  let exec_count = 0;
+  let last_last_index = -1;
+  let fake_re = {
+    exec: () => {
+      return exec_count++ == 0 ? [""] : null;
+    },
+
+    get lastIndex() {
+      return lastIndex;
+    },
+
+    set lastIndex(value) {
+    },
+
+    get global() {
+      return true;
+    }
+  };
+
+  RegExp.prototype[Symbol.match].call(fake_re, "abc");
+}
+
+testAdvanceStringIndex(0x7ffffff);