YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiple JSON.parse issues (#2191)

Browse Source 
Fixes #2180, #2192

JerryScript-DCO-1.0-Signed-off-by: Daniel Balla dballa@inf.u-szeged.hu
This commit is contained in:
Daniel Balla
2018-02-01 22:34:21 +01:00
committed by Dániel Bátyai
parent 36051ec92b
commit c429530d02
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-json.c
+7 -2
View File
@@ -161,6 +161,12 @@ ecma_builtin_json_parse_string (ecma_json_token_t *token_p) /**< token argument
current_p++;
has_escape_sequence = true;
/* If there is an escape sequence but there's no escapable character just return */
if (current_p >= end_p)
{
return;
}
switch (*current_p)
{
case LIT_CHAR_DOUBLE_QUOTE:
@@ -177,8 +183,7 @@ ecma_builtin_json_parse_string (ecma_json_token_t *token_p) /**< token argument
case LIT_CHAR_LOWERCASE_U:
{
ecma_char_t code_unit;
if (!(lit_read_code_unit_from_hex (current_p + 1, 4, &code_unit)))
if ((end_p - current_p >= 2) && !(lit_read_code_unit_from_hex (current_p + 1, 4, &code_unit)))
{
return;
}