archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Use ToNumber when checking lastIndex during RegExp exec()

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai.u-szeged@partner.samsung.com
This commit is contained in:
Dániel Bátyai 2015-07-28 19:09:44 +02:00
parent 048e20925e
commit fe475eace7
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jerry-core/ecma/operations/ecma-regexp-object.cpp
View File

@ -1223,15 +1223,18 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
{
ecma_string_t *magic_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL);
ecma_property_t *lastindex_prop_p = ecma_op_object_get_property (obj_p, magic_str_p);
ecma_number_t *lastindex_num_p = ecma_get_number_from_value (lastindex_prop_p->u.named_data_property.value);
index = ecma_number_to_int32 (*lastindex_num_p);
ECMA_OP_TO_NUMBER_TRY_CATCH (lastindex_num, lastindex_prop_p->u.named_data_property.value, ret_value)
index = ecma_number_to_int32 (lastindex_num);
JERRY_ASSERT (iter_p->buf_pos.offset == 0 && !iter_p->buf_pos.is_non_bmp_middle);
if (!lit_utf8_iterator_is_eos (iter_p)
&& *lastindex_num_p <= input_str_len)
&& index <= (int32_t) input_str_len
&& index > 0)
{
lit_utf8_iterator_advance (iter_p, (ecma_length_t) *lastindex_num_p);
lit_utf8_iterator_advance (iter_p, (ecma_length_t) index);
}
ECMA_OP_TO_NUMBER_FINALIZE (lastindex_num);
ecma_deref_ecma_string (magic_str_p);
}

24
tests/jerry/regexp-assertions.js
View File

@ -150,3 +150,27 @@ assert (t == "");
t = new RegExp ("(?!.)").exec("a");
assert (t == "");
t = new RegExp ("abc","g");
t.lastIndex = {toString: function () { return "4"}};
var result = t.exec("abc abc");
assert(result[0] === "abc");
assert(result.index === 6);
t = new RegExp ("abc","g");
t.lastIndex = {valueOf: function () { return "4"}};
var result = t.exec("abc abc");
assert(result[0] === "abc");
assert(result.index === 6);
t = new RegExp ("abc","g");
t.lastIndex = "2"
var result = t.exec("abc abc");
assert(result[0] === "abc");
assert(result.index === 6);
t = new RegExp ("abc","g");
t.lastIndex = -12;
result = t.exec("abc abc");
assert(!result);
assert(t.lastIndex === 0);