diff options
| author | Dániel Bátyai <dbatyai@inf.u-szeged.hu> | 2019-07-30 19:48:56 +0200 |
|---|---|---|
| committer | Robert Fancsik <frobert@inf.u-szeged.hu> | 2019-07-30 19:48:56 +0200 |
| commit | dfafb1aa6b31b30a4a5dbc1b1b4abcd313985d72 (patch) | |
| tree | adc7395c8a8c0517eb40b4ee1f46f53b29441cfd /targets | |
| parent | a2d242eab9fec89ff392752c6e780a3ca50ca080 (diff) | |
Fix unhandled exceptions with unicode error messages (#2994)
Fixes #2993
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
Diffstat (limited to 'targets')
| -rw-r--r-- | targets/curie_bsp/jerry_app/quark/main.c | 4 | ||||
| -rw-r--r-- | targets/esp8266/user/jerry_extapi.c | 8 | ||||
| -rw-r--r-- | targets/nuttx-stm32f4/jerry_main.c | 2 | ||||
| -rw-r--r-- | targets/tizenrt-artik053/apps/jerryscript/jerry_main.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/targets/curie_bsp/jerry_app/quark/main.c b/targets/curie_bsp/jerry_app/quark/main.c index b14b532c..2aee9143 100644 --- a/targets/curie_bsp/jerry_app/quark/main.c +++ b/targets/curie_bsp/jerry_app/quark/main.c @@ -48,9 +48,9 @@ void jerry_resolve_error (jerry_value_t ret_value) { ret_value = jerry_get_value_from_error (ret_value, true); jerry_value_t err_str_val = jerry_value_to_string (ret_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); jerry_char_t *err_str_buf = (jerry_char_t *) balloc (err_str_size, NULL); - jerry_size_t sz = jerry_string_to_char_buffer (err_str_val, err_str_buf, err_str_size); + jerry_size_t sz = jerry_string_to_utf8_char_buffer (err_str_val, err_str_buf, err_str_size); err_str_buf[sz] = 0; printk ("Script Error: unhandled exception: %s\n", err_str_buf); bfree(err_str_buf); diff --git a/targets/esp8266/user/jerry_extapi.c b/targets/esp8266/user/jerry_extapi.c index 8b5afb08..96395b1d 100644 --- a/targets/esp8266/user/jerry_extapi.c +++ b/targets/esp8266/user/jerry_extapi.c @@ -55,7 +55,7 @@ DELCARE_HANDLER(print) { { if (jerry_value_is_string (args_p[cc])) { - jerry_size_t size = jerry_get_string_size (args_p[0]); + jerry_size_t size = jerry_get_utf8_string_size (args_p[0]); char *buffer; buffer = (char *) malloc(size + 1); @@ -66,9 +66,9 @@ DELCARE_HANDLER(print) { continue; } - jerry_string_to_char_buffer (args_p[cc], - (jerry_char_t *) buffer, - size); + jerry_string_to_utf8_char_buffer (args_p[cc], + (jerry_char_t *) buffer, + size); *(buffer + size) = 0; printf("%s ", buffer); free (buffer); diff --git a/targets/nuttx-stm32f4/jerry_main.c b/targets/nuttx-stm32f4/jerry_main.c index 36d10f38..1afd18e4 100644 --- a/targets/nuttx-stm32f4/jerry_main.c +++ b/targets/nuttx-stm32f4/jerry_main.c @@ -160,7 +160,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */ error_value = jerry_get_value_from_error (error_value, false); 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); jerry_char_t err_str_buf[256]; jerry_release_value (error_value); diff --git a/targets/tizenrt-artik053/apps/jerryscript/jerry_main.c b/targets/tizenrt-artik053/apps/jerryscript/jerry_main.c index b407f2d1..490844da 100644 --- a/targets/tizenrt-artik053/apps/jerryscript/jerry_main.c +++ b/targets/tizenrt-artik053/apps/jerryscript/jerry_main.c @@ -132,7 +132,7 @@ print_unhandled_exception (jerry_value_t error_value) /**< error value */ error_value = jerry_get_value_from_error (error_value, false); 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); jerry_char_t err_str_buf[256]; jerry_release_value (error_value); |