diff options
author | Robert Fancsik <frobert@inf.u-szeged.hu> | 2021-01-08 16:03:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 16:03:33 +0100 |
commit | 7b00db40799630709e6017ba9073815a4b6cb4eb (patch) | |
tree | 1a95ed683c724bf464eaec38ecd30c8dc83d44b3 /jerry-main | |
parent | 4350401b5b8a9be2d44d4154aeb953bf989ac4b4 (diff) |
Fix unavailable source file handling in main_print_unhandled_exception (#4424)
This patch fixes #4403.
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
Diffstat (limited to 'jerry-main')
-rw-r--r-- | jerry-main/main-utils.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/jerry-main/main-utils.c b/jerry-main/main-utils.c index b108f180..205853de 100644 --- a/jerry-main/main-utils.c +++ b/jerry-main/main-utils.c @@ -323,9 +323,6 @@ main_print_unhandled_exception (jerry_value_t error_value) /**< error value */ if (err_line != 0 && err_col > 0 && err_col < SYNTAX_ERROR_MAX_LINE_LENGTH) { - uint32_t curr_line = 1; - uint32_t pos = 0; - /* Temporarily modify the error message, so we can use the path. */ *path_str_end_p = '\0'; @@ -335,38 +332,44 @@ main_print_unhandled_exception (jerry_value_t error_value) /**< error value */ /* Revert the error message. */ *path_str_end_p = ':'; - /* 2. seek and print */ - while (pos < source_size && curr_line < err_line) + if (source_p != NULL) { - if (source_p[pos] == '\n') + uint32_t curr_line = 1; + uint32_t pos = 0; + + /* 2. seek and print */ + while (pos < source_size && curr_line < err_line) { - curr_line++; + if (source_p[pos] == '\n') + { + curr_line++; + } + + pos++; } - pos++; - } + /* Print character if: + * - The max line length is not reached. + * - The current position is valid (it is not the end of the source). + * - The current character is not a newline. + **/ + for (uint32_t char_count = 0; + (char_count < SYNTAX_ERROR_MAX_LINE_LENGTH) && (pos < source_size) && (source_p[pos] != '\n'); + char_count++, pos++) + { + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "%c", source_p[pos]); + } + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "\n"); - /* Print character if: - * - The max line length is not reached. - * - The current position is valid (it is not the end of the source). - * - The current character is not a newline. - **/ - for (uint32_t char_count = 0; - (char_count < SYNTAX_ERROR_MAX_LINE_LENGTH) && (pos < source_size) && (source_p[pos] != '\n'); - char_count++, pos++) - { - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "%c", source_p[pos]); - } - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "\n"); + jerry_port_release_source (source_p); - jerry_port_release_source (source_p); + while (--err_col) + { + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "~"); + } - while (--err_col) - { - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "~"); + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "^\n\n"); } - - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "^\n\n"); } } } |