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

Fix error handling in SerializeJSONProperty (#3816)

Browse Source 
Fixes #3813.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai 2020-05-30 19:46:52 +02:00 committed by GitHub
parent 3b4c259281
commit d06c3a7f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jerry-core/ecma/builtin-objects/ecma-builtin-json.c
View File

@ -1186,36 +1186,36 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p,
ecma_object_t *obj_p = ecma_get_object_from_value (value); ecma_object_t *obj_p = ecma_get_object_from_value (value);
lit_magic_string_id_t class_name = ecma_object_get_class_name (obj_p); lit_magic_string_id_t class_name = ecma_object_get_class_name (obj_p);
ecma_value_t result = ECMA_VALUE_EMPTY;
/* 5.a */ /* 5.a */
if (class_name == LIT_MAGIC_STRING_NUMBER_UL) if (class_name == LIT_MAGIC_STRING_NUMBER_UL)
{ {
result = ecma_op_to_number (value); value = ecma_op_to_number (value);
ecma_deref_object (obj_p);
if (ECMA_IS_VALUE_ERROR (value))
{
return value;
}
} }
/* 5.b */ /* 5.b */
else if (class_name == LIT_MAGIC_STRING_STRING_UL) else if (class_name == LIT_MAGIC_STRING_STRING_UL)
{ {
ecma_string_t *str_p = ecma_op_to_string (value); ecma_string_t *str_p = ecma_op_to_string (value);
result = ecma_make_string_value (str_p); ecma_deref_object (obj_p);
if (JERRY_UNLIKELY (str_p == NULL))
{
return ECMA_VALUE_ERROR;
}
value = ecma_make_string_value (str_p);
} }
/* 5.c */ /* 5.c */
else if (class_name == LIT_MAGIC_STRING_BOOLEAN_UL) else if (class_name == LIT_MAGIC_STRING_BOOLEAN_UL)
{ {
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p; ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
result = ext_object_p->u.class_prop.u.value; value = ext_object_p->u.class_prop.u.value;
}
if (!ecma_is_value_empty (result))
{
ecma_deref_object (obj_p); ecma_deref_object (obj_p);
if (ECMA_IS_VALUE_ERROR (result))
{
return result;
}
value = result;
} }
} }

23
tests/jerry/regression-test-issue-3813.js Normal file
View File

@ -0,0 +1,23 @@
// 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 o = Object("str");
o.toString = function() { throw "toString error" };
try {
JSON.stringify(o);
assert(false);
} catch (e) {
assert(e === "toString error");
}