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

Fix unhandled exceptions with unicode error messages (#2994)

Browse Source 
Fixes #2993

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
2019-07-30 19:48:56 +02:00
committed by Robert Fancsik
parent a2d242eab9
commit dfafb1aa6b
7 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-main/main-unix-snapshot.c
+2 -2
View File
@@ -172,7 +172,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */
return;
}
jerry_size_t err_str_size = jerry_get_string_size (err_str_val);
jerry_size_t err_str_size = jerry_get_utf8_string_size (err_str_val);
if (err_str_size >= 256)
{
@@ -182,7 +182,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */
}
jerry_char_t err_str_buf[256];
jerry_size_t string_end = jerry_string_to_char_buffer (err_str_val, err_str_buf, err_str_size);
jerry_size_t string_end = jerry_string_to_utf8_char_buffer (err_str_val, err_str_buf, err_str_size);
assert (string_end == err_str_size);
err_str_buf[string_end] = 0;
jerry-main/main-unix.c
+3 -3
View File
@@ -118,7 +118,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */
if (!jerry_value_is_error (item_val)
&& jerry_value_is_string (item_val))
{
jerry_size_t str_size = jerry_get_string_size (item_val);
jerry_size_t str_size = jerry_get_utf8_string_size (item_val);
if (str_size >= 256)
{
@@ -126,7 +126,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */
}
else
{
jerry_size_t string_end = jerry_string_to_char_buffer (item_val, err_str_buf, str_size);
jerry_size_t string_end = jerry_string_to_utf8_char_buffer (item_val, err_str_buf, str_size);
assert (string_end == str_size);
err_str_buf[string_end] = 0;
@@ -141,7 +141,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */
}
jerry_value_t err_str_val = jerry_value_to_string (error_value);
jerry_size_t err_str_size = jerry_get_string_size (err_str_val);
jerry_size_t err_str_size = jerry_get_utf8_string_size (err_str_val);
if (err_str_size >= 256)
{