archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2026-01-27 13:36:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix Assertion 'ecma_get_value_type_field (value) == ECMA_TYPE_OBJECT' in RegExp.

Browse Source 
Related issue: 316

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó 2015-08-05 09:34:10 +02:00
parent 97aed75a46
commit 2d80456eb7
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp
View File

@ -59,7 +59,8 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
{
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
if (ecma_object_get_class_name (ecma_get_object_from_value (this_arg)) != LIT_MAGIC_STRING_REGEXP_UL)
if (!ecma_is_value_object (this_arg)
|| ecma_object_get_class_name (ecma_get_object_from_value (this_arg)) != LIT_MAGIC_STRING_REGEXP_UL)
{
ret_value = ecma_raise_type_error ("Incomplete RegExp type");
}
@ -127,7 +128,8 @@ ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argume
{
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
if (ecma_object_get_class_name (ecma_get_object_from_value (this_arg)) != LIT_MAGIC_STRING_REGEXP_UL)
if (!ecma_is_value_object (this_arg)
|| ecma_object_get_class_name (ecma_get_object_from_value (this_arg)) != LIT_MAGIC_STRING_REGEXP_UL)
{
ret_value = ecma_raise_type_error ("Incomplete RegExp type");
}

44
tests/jerry/regression-test-issue-316.js Normal file
View File

@ -0,0 +1,44 @@
// 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.
try {
v_1 = RegExp.prototype.test;
v_1(ReferenceError);
}
catch (e)
{
assert (e instanceof TypeError);
assert (e.message === "Incomplete RegExp type");
}
try {
v_1 = RegExp.prototype.exec;
v_1(ReferenceError);
}
catch (e)
{
assert (e instanceof TypeError);
assert (e.message === "Incomplete RegExp type");
}
try {
v_1 = RegExp.prototype.toString;
v_1(ReferenceError);
}
catch (e)
{
assert (e instanceof TypeError);
assert (e.message === "Incomplete RegExp type");
}