Assertion fix in RegExp.
Assertion 'mem_pools == NULL' failed in mem_pools_finalize JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
@@ -644,7 +644,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
|
|||||||
re_ctx_p->saved_p[RE_GLOBAL_END_IDX] = str_p;
|
re_ctx_p->saved_p[RE_GLOBAL_END_IDX] = str_p;
|
||||||
*res_p = str_p;
|
*res_p = str_p;
|
||||||
re_ctx_p->recursion_depth--;
|
re_ctx_p->recursion_depth--;
|
||||||
return ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE); /* match */
|
return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE); /* match */
|
||||||
}
|
}
|
||||||
case RE_OP_ALTERNATIVE:
|
case RE_OP_ALTERNATIVE:
|
||||||
{
|
{
|
||||||
@@ -1003,12 +1003,13 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
|
|||||||
ecma_completion_value_t match_value = re_match_regexp (re_ctx_p, bc_p, str_p, &sub_str_p);
|
ecma_completion_value_t match_value = re_match_regexp (re_ctx_p, bc_p, str_p, &sub_str_p);
|
||||||
if (!ecma_is_value_true (match_value))
|
if (!ecma_is_value_true (match_value))
|
||||||
{
|
{
|
||||||
|
if (ecma_is_completion_value_throw (match_value))
|
||||||
|
{
|
||||||
|
return match_value;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (ecma_is_completion_value_throw (match_value))
|
|
||||||
{
|
|
||||||
return match_value;
|
|
||||||
}
|
|
||||||
str_p = sub_str_p;
|
str_p = sub_str_p;
|
||||||
num_of_iter++;
|
num_of_iter++;
|
||||||
}
|
}
|
||||||
@@ -1033,12 +1034,13 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
|
|||||||
ecma_completion_value_t match_value = re_match_regexp (re_ctx_p, bc_p, str_p, &sub_str_p);
|
ecma_completion_value_t match_value = re_match_regexp (re_ctx_p, bc_p, str_p, &sub_str_p);
|
||||||
if (!ecma_is_value_true (match_value))
|
if (!ecma_is_value_true (match_value))
|
||||||
{
|
{
|
||||||
|
if (ecma_is_completion_value_throw (match_value))
|
||||||
|
{
|
||||||
|
return match_value;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (ecma_is_completion_value_throw (match_value))
|
|
||||||
{
|
|
||||||
return match_value;
|
|
||||||
}
|
|
||||||
str_p = sub_str_p;
|
str_p = sub_str_p;
|
||||||
num_of_iter++;
|
num_of_iter++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
// Copyright 2015 Samsung Electronics Co., Ltd.
|
||||||
|
// Copyright 2015 University of Szeged.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
v_0 = /(?!(?!l{666,}))/;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
v_0.exec("llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll");
|
||||||
|
}
|
||||||
|
catch (e)
|
||||||
|
{
|
||||||
|
assert (e instanceof RangeError);
|
||||||
|
assert (e.message === "RegExp executor steps limit is exceeded.");
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user