Fix built-in RegExp allocation with default constructor (#3883)
Fixes #3880. Fixes #3881. JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
@@ -210,32 +210,14 @@ ecma_object_t *
|
|||||||
ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer */
|
ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer */
|
||||||
{
|
{
|
||||||
#if ENABLED (JERRY_ES2015)
|
#if ENABLED (JERRY_ES2015)
|
||||||
bool default_alloc = false;
|
|
||||||
|
|
||||||
if (ctr_obj_p == NULL)
|
if (ctr_obj_p == NULL)
|
||||||
{
|
{
|
||||||
ecma_object_t *re_prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE);
|
ctr_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP);
|
||||||
|
|
||||||
ecma_value_t ctr_value = ecma_op_object_get_by_magic_id (re_prototype_obj_p, LIT_MAGIC_STRING_CONSTRUCTOR);
|
|
||||||
|
|
||||||
if (ECMA_IS_VALUE_ERROR (ctr_value))
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ctr_obj_p = ecma_get_object_from_value (ctr_value);
|
|
||||||
|
|
||||||
default_alloc = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ecma_object_t *proto_obj_p = ecma_op_get_prototype_from_constructor (ctr_obj_p,
|
ecma_object_t *proto_obj_p = ecma_op_get_prototype_from_constructor (ctr_obj_p,
|
||||||
ECMA_BUILTIN_ID_REGEXP_PROTOTYPE);
|
ECMA_BUILTIN_ID_REGEXP_PROTOTYPE);
|
||||||
|
|
||||||
if (default_alloc)
|
|
||||||
{
|
|
||||||
ecma_deref_object (ctr_obj_p);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (JERRY_UNLIKELY (proto_obj_p == NULL))
|
if (JERRY_UNLIKELY (proto_obj_p == NULL))
|
||||||
{
|
{
|
||||||
return proto_obj_p;
|
return proto_obj_p;
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
RegExp.prototype.constructor = ""
|
||||||
|
var r = /a/;
|
||||||
|
assert (r.test ("a"));
|
||||||
|
|
||||||
|
RegExp.prototype.constructor = {}
|
||||||
|
r = /b/;
|
||||||
|
assert (r.test ("b"));
|
||||||
Reference in New Issue
Block a user