From 6c4b316609e7d96d1d6b77b5158f7fb8b0a7a255 Mon Sep 17 00:00:00 2001 From: Robert Sipka Date: Thu, 15 Nov 2018 14:13:49 +0100 Subject: [PATCH] [Debugger] Modify the object representation in case of variables request. (#2594) Return with the object`s toString() method instead of create a json formated string from it. It could have led to an error in previous cases (an object contains itself etc.) JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com --- jerry-core/debugger/debugger.c | 9 +-------- tests/debugger/do_variables.expected | 12 ++++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/jerry-core/debugger/debugger.c b/jerry-core/debugger/debugger.c index 0a0676b59..bb40071ce 100644 --- a/jerry-core/debugger/debugger.c +++ b/jerry-core/debugger/debugger.c @@ -492,14 +492,7 @@ jerry_debugger_send_scope_variables (const uint8_t *recv_buffer_p) /**< pointer jerry_debugger_scope_variable_type_t variable_type = jerry_debugger_get_variable_type (prop_value_p.value); - if (variable_type == JERRY_DEBUGGER_VALUE_OBJECT) - { - property_value = ecma_builtin_json_string_from_object (prop_value_p.value); - } - else - { - property_value = ecma_op_to_string (prop_value_p.value); - } + property_value = ecma_op_to_string (prop_value_p.value); if (!jerry_debugger_copy_variables_to_string_message (variable_type, ecma_get_string_from_value (property_value), diff --git a/tests/debugger/do_variables.expected b/tests/debugger/do_variables.expected index a2b8a6c64..5b476375c 100644 --- a/tests/debugger/do_variables.expected +++ b/tests/debugger/do_variables.expected @@ -119,10 +119,10 @@ name | type | value h | undefined | undefined a | Array | [1,2,3] (jerry-debugger) variables 2 -name | type | value -b | Number | 10 -x | Boolean | true -user | Object | {"name":"John","age":30} -m | Null | null -c | Number | 10 +name | type | value +b | Number | 10 +x | Boolean | true +user | Object | [object Object] +m | Null | null +c | Number | 10 (jerry-debugger) c