YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix string position calculation in @@replace (#3831)

Browse Source 
Fixes #3817.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai
2020-06-02 16:15:23 +02:00
committed by GitHub
parent d06c3a7f50
commit 9ceece8eb4
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-regexp-object.c
+16 -1
View File
@@ -3115,7 +3115,22 @@ ecma_regexp_replace_helper (ecma_value_t this_arg, /**< this argument */
(lit_utf8_size_t) (match_position_p - source_position_p));
replace_ctx.match_byte_pos = (lit_utf8_size_t) (match_position_p - replace_ctx.string_p);
source_position_p = JERRY_MIN (match_position_p + matched_str_size, string_end_p);
if ((string_flags & ECMA_STRING_FLAG_IS_ASCII) && matched_str_size == matched_str_length)
{
source_position_p = JERRY_MIN (match_position_p + matched_str_size, string_end_p);
}
else
{
lit_utf8_size_t code_unit_count = matched_str_length;
while (code_unit_count-- > 0 && JERRY_LIKELY (match_position_p < string_end_p))
{
lit_utf8_incr (&match_position_p);
}
source_position_p = match_position_p;
}
replace_ctx.index = JERRY_MIN (position + matched_str_length, string_length);
}