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)
{
targets/curie_bsp/jerry_app/quark/main.c
+2 -2
View File
@@ -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);
targets/esp8266/user/jerry_extapi.c
+4 -4
View File
@@ -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);
targets/nuttx-stm32f4/jerry_main.c
+1 -1
View File
@@ -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);
targets/tizenrt-artik053/apps/jerryscript/jerry_main.c
+1 -1
View File
@@ -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);
tests/jerry/fail/regression-test-issue-2993.js
+15
View File
@@ -0,0 +1,15 @@
// Copyright JS Foundation and other contributors, http://js.foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
throw new SyntaxError("𐐀");