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

Date.protoype.toJSON should look for toISOString once (#3996)

Browse Source 
The toJSON method should be searched on the `this` object
only once. In case of normal objects there were no problems
however when a Proxy object is used as the `this` argument
for the Date.prototype.toJSON method the Proxy's `get` method
was invoked twice.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.usz@partner.samsung.com
This commit is contained in:
Péter Gál 2020-07-15 17:12:55 +02:00 committed by GitHub
parent 8fdbc6a85b
commit c8d15ddbf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c
View File

@ -162,28 +162,15 @@ ecma_builtin_date_prototype_to_json (ecma_value_t this_arg) /**< this argument *
return ECMA_VALUE_NULL;
}
}
else
{
ecma_free_value (tv);
}
ecma_value_t ret_value = ECMA_VALUE_ERROR;
ecma_object_t *value_obj_p = ecma_get_object_from_value (obj);
/* 4. */
ecma_value_t to_iso = ecma_op_object_get_by_magic_id (value_obj_p, LIT_MAGIC_STRING_TO_ISO_STRING_UL);
if (!ECMA_IS_VALUE_ERROR (to_iso))
{
/* 5. */
if (!ecma_op_is_callable (to_iso))
{
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("'toISOString' is missing or not a function."));
}
/* 6. */
else
{
ret_value = ecma_op_invoke_by_magic_id (obj, LIT_MAGIC_STRING_TO_ISO_STRING_UL, NULL, 0);
}
ecma_free_value (to_iso);
}
ecma_value_t ret_value = ecma_op_invoke_by_magic_id (obj, LIT_MAGIC_STRING_TO_ISO_STRING_UL, NULL, 0);
ecma_deref_object (value_obj_p);

22
tests/jerry/date-tojson.js Normal file
View File

@ -0,0 +1,22 @@
// 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.
var obj = {
toISOString: function() { return "RESULT-ToISOString"; },
valueOf: function() { return "RESULT-valueOf"; }
};
var result = Date.prototype.toJSON.call(obj);
assert(result === "RESULT-ToISOString");

45
tests/jerry/es.next/proxy-date-prototype-json.js Normal file
View File

@ -0,0 +1,45 @@
// 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.
/* Test the Date.prototype.toJSON method's internal operation order
* by creating a Proxy to catch the method invokations.
*/
var found = [];
var target = {
toString: function() { return "TARGET_toString"; },
toISOString: function() { return "TARGET_toISOString"; }
};
var prox = new Proxy(target, {
get: function(trg, key) {
found.push(key);
return trg[key];
}
});
/* Date.prototype.toJSON -> ... -> <target>.toISOString() */
var json_result = Date.prototype.toJSON.call(prox);
assert(json_result === "TARGET_toISOString");
/* Data.prototype.toJSON -> toPrimitive -> Get -> [[Get]]
* The first element in the "found" properties should be the "@@toPrimitive" well-known Symbol.
*/
assert(found[0] === Symbol.toPrimitive);
/* Date.prototype.toJSON -> Invoke -> GetMethod -> GetV -> [[Get]]
* All other elements are "methods" and there should be no duplicates.
*/
var methods = found.slice(1);
assert(methods.toString() === "valueOf,toString,toISOString");