Add new input validator API functions

Fixes #1549

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com

Author: LaszloLango

docs/02.API-REFERENCE.md

@@ -1233,6 +1233,7 @@ jerry_get_string_size (const jerry_value_t value);
 
 - [jerry_create_string](#jerry_create_string)
 - [jerry_get_string_length](#jerry_get_string_length)
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
 
 
 ## jerry_get_utf8_string_size
@@ -1272,6 +1273,8 @@ jerry_get_utf8_string_size (const jerry_value_t value);
 
 - [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
 - [jerry_get_utf8_string_length](#jerry_get_utf8_string_length)
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
+
 
 ## jerry_get_string_length
 
@@ -1308,6 +1311,8 @@ jerry_get_string_length (const jerry_value_t value);
 
 - [jerry_create_string](#jerry_create_string)
 - [jerry_get_string_size](#jerry_get_string_size)
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
+
 
 ## jerry_get_utf8_string_length
 
@@ -1347,6 +1352,8 @@ jerry_get_utf8_string_length (const jerry_value_t value);
 
 - [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
 - [jerry_get_utf8_string_size](#jerry_get_utf8_string_size)
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
+
 
 ## jerry_string_to_char_buffer
 
@@ -1394,6 +1401,8 @@ jerry_string_to_char_buffer (const jerry_value_t value,
 
 - [jerry_create_string](#jerry_create_string)
 - [jerry_get_string_size](#jerry_get_string_size)
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
+
 
 ## jerry_string_to_utf8_char_buffer
 
@@ -1441,6 +1450,8 @@ jerry_string_to_utf8_char_buffer (const jerry_value_t value,
 
 - [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
 - [jerry_get_utf8_string_size](#jerry_get_utf8_string_size)
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
+
 
 ## jerry_substring_to_char_buffer
 
@@ -1496,6 +1507,8 @@ jerry_substring_to_char_buffer (const jerry_value_t value,
 - [jerry_create_string](#jerry_create_string)
 - [jerry_get_string_size](#jerry_get_string_size)
 - [jerry_get_string_length](#jerry_get_string_length)
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
+
 
 ## jerry_substring_to_utf8_char_buffer
 
@@ -1548,9 +1561,12 @@ jerry_substring_to_utf8_char_buffer (const jerry_value_t value,
 
 **See also**
 
-- [jerry_create_string_from_utf8](#jerry_create_string)
+- [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
 - [jerry_get_utf8_string_size](#jerry_get_utf8_string_size)
 - [jerry_get_utf8_string_length](#jerry_get_utf8_string_length)
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
+
+
 # Functions for array object values
 
 ## jerry_get_array_length
@@ -2260,6 +2276,7 @@ jerry_create_string (const jerry_char_t *str_p);
 
 **See also**
 
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
 - [jerry_create_string_sz](#jerry_create_string_sz)
 
 
@@ -2298,8 +2315,10 @@ jerry_create_string_sz (const jerry_char_t *str_p,
 
 **See also**
 
+- [jerry_is_cesu8_string_valid](#jerry_is_cesu8_string_valid)
 - [jerry_create_string](#jerry_create_string)
 
+
 ## jerry_create_string_from_utf8
 
 **Summary**
@@ -2333,6 +2352,7 @@ jerry_create_string_from_utf8 (const jerry_char_t *str_p);
 
 **See also**
 
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
 - [jerry_create_string_sz_from_utf8](#jerry_create_string_sz_from_utf8)
 
 
@@ -2373,8 +2393,10 @@ jerry_create_string_sz (const jerry_char_t *str_p,
 
 **See also**
 
+- [jerry_is_utf8_string_valid](#jerry_is_utf8_string_valid)
 - [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
 
+
 ## jerry_create_undefined
 
 **Summary**
@@ -3287,6 +3309,99 @@ bool foreach_function (const jerry_value_t prop_name,
 - [jerry_object_property_foreach_t](#jerry_object_property_foreach_t)
 
 
+# Input validatator functions
+
+## jerry_is_utf8_string_valid
+
+**Summary**
+
+Validate UTF-8 string.
+
+**Prototype**
+
+```c
+bool
+jerry_is_utf8_string_valid (const jerry_char_t *utf8_buf_p, /**< UTF-8 string */
+                            jerry_size_t buf_size) /**< string size */
+```
+
+- `utf8_buf_p` - UTF-8 input string
+- `buf_size` - input string size
+
+**Example**
+
+```c
+{
+  const jerry_char_t script[] = "print ('Hello, World!');";
+  size_t script_size = strlen ((const char *) script);
+
+  if (jerry_is_utf8_string_valid (script, (jerry_size_t) script_size))
+  {
+    jerry_run_simple (script, script_size, JERRY_INIT_EMPTY);
+  }
+}
+```
+
+**See also**
+
+- [jerry_run_simple](#jerry_run_simple)
+- [jerry_create_string_from_utf8](#jerry_create_string_from_utf8)
+- [jerry_create_string_sz_from_utf8](#jerry_create_string_sz_from_utf8)
+- [jerry_get_utf8_string_size](#jerry_get_utf8_string_size)
+- [jerry_get_utf8_string_length](#jerry_get_utf8_string_length)
+- [jerry_string_to_utf8_char_buffer](#jerry_string_to_utf8_char_buffer)
+- [jerry_substring_to_utf8_char_buffer](#jerry_substring_to_utf8_char_buffer)
+
+## jerry_is_cesu8_string_valid
+
+**Summary**
+
+Validate CESU-8 string.
+
+**Prototype**
+
+```c
+bool
+jerry_is_cesu8_string_valid (const jerry_char_t *cesu8_buf_p, /**< CESU-8 string */
+                             jerry_size_t buf_size) /**< string size */
+```
+
+- `cesu8_buf_p` - CESU-8 input string
+- `buf_size` - input string size
+
+**Example**
+
+```c
+{
+  jerry_init (JERRY_INIT_EMPTY);
+
+  const jerry_char_t script[] = "Hello, World!";
+  size_t script_size = strlen ((const char *) script);
+
+  if (jerry_is_cesu8_string_valid (script, (jerry_size_t) script_size))
+  {
+    jerry_value_t string_value = jerry_create_string_sz (script,
+                                                         (jerry_size_t) script_size));
+
+    ... // usage of string_value
+
+    jerry_release_value (string_value);
+  }
+
+  jerry_cleanup ();
+}
+```
+
+**See also**
+
+- [jerry_create_string](#jerry_create_string)
+- [jerry_create_string_sz](#jerry_create_string_sz)
+- [jerry_get_string_size](#jerry_get_string_size)
+- [jerry_get_string_length](#jerry_get_string_length)
+- [jerry_string_to_char_buffer](#jerry_string_to_char_buffer)
+- [jerry_substring_to_char_buffer](#jerry_substring_to_char_buffer)
+
+
 # Snapshot functions
 
 ## jerry_parse_and_save_snapshot

jerry-core/jerry.c

@@ -982,7 +982,7 @@ jerry_create_object (void)
 } /* jerry_create_object */
 
 /**
- * Create string from a valid UTF8 string
+ * Create string from a valid UTF-8 string
  *
  * Note:
  *      returned value must be freed with jerry_release_value when it is no longer needed.
@@ -996,7 +996,7 @@ jerry_create_string_from_utf8 (const jerry_char_t *str_p) /**< pointer to string
 } /* jerry_create_string_from_utf8 */
 
 /**
- * Create string from a valid UTF8 string
+ * Create string from a valid UTF-8 string
  *
  * Note:
  *      returned value must be freed with jerry_release_value when it is no longer needed.
@@ -1016,7 +1016,7 @@ jerry_create_string_sz_from_utf8 (const jerry_char_t *str_p, /**< pointer to str
 } /* jerry_create_string_sz_from_utf8 */
 
 /**
- * Create string from a valid CESU8 string
+ * Create string from a valid CESU-8 string
  *
  * Note:
  *      returned value must be freed with jerry_release_value, when it is no longer needed.
@@ -1030,7 +1030,7 @@ jerry_create_string (const jerry_char_t *str_p) /**< pointer to string */
 } /* jerry_create_string */
 
 /**
- * Create string from a valid CESU8 string
+ * Create string from a valid CESU-8 string
  *
  * Note:
  *      returned value must be freed with jerry_release_value when it is no longer needed.
@@ -2006,6 +2006,34 @@ jerry_foreach_object_property (const jerry_value_t obj_val, /**< object value */
   return false;
 } /* jerry_foreach_object_property */
 
+/**
+ * Validate UTF-8 string
+ *
+ * @return true - if UTF-8 string is well-formed
+ *         false - otherwise
+ */
+bool
+jerry_is_utf8_string_valid (const jerry_char_t *utf8_buf_p, /**< UTF-8 string */
+                            jerry_size_t buf_size) /**< string size */
+{
+  return lit_is_utf8_string_valid ((lit_utf8_byte_t *) utf8_buf_p,
+                                   (lit_utf8_size_t) buf_size);
+} /* jerry_is_utf8_string_valid */
+
+/**
+ * Validate CESU-8 string
+ *
+ * @return true - if CESU-8 string is well-formed
+ *         false - otherwise
+ */
+bool
+jerry_is_cesu8_string_valid (const jerry_char_t *cesu8_buf_p, /**< CESU-8 string */
+                             jerry_size_t buf_size) /**< string size */
+{
+  return lit_is_cesu8_string_valid ((lit_utf8_byte_t *) cesu8_buf_p,
+                                    (lit_utf8_size_t) buf_size);
+} /* jerry_is_cesu8_string_valid */
+
 /**
  * @}
  */

jerry-core/jerryscript.h

@@ -329,6 +329,12 @@ void jerry_set_object_native_handle (const jerry_value_t obj_val, uintptr_t hand
 bool jerry_foreach_object_property (const jerry_value_t obj_val, jerry_object_property_foreach_t foreach_p,
                                     void *user_data_p);
 
+/**
+ * Input validatator functions
+ */
+bool jerry_is_utf8_string_valid (const jerry_char_t *utf8_buf_p, jerry_size_t buf_size);
+bool jerry_is_cesu8_string_valid (const jerry_char_t *cesu8_buf_p, jerry_size_t buf_size);
+
 /**
  * Snapshot functions
  */

jerry-core/lit/lit-strings.c

@@ -125,14 +125,14 @@ lit_is_utf8_string_valid (const lit_utf8_byte_t *utf8_buf_p, /**< utf-8 string *
  *         false otherwise
  */
 bool
-lit_is_cesu8_string_valid (const lit_utf8_byte_t *utf8_buf_p, /**< utf-8 string */
+lit_is_cesu8_string_valid (const lit_utf8_byte_t *cesu8_buf_p, /**< cesu-8 string */
                            lit_utf8_size_t buf_size) /**< string size */
 {
   lit_utf8_size_t idx = 0;
 
   while (idx < buf_size)
   {
-    lit_utf8_byte_t c = utf8_buf_p[idx++];
+    lit_utf8_byte_t c = cesu8_buf_p[idx++];
     if ((c & LIT_UTF8_1_BYTE_MASK) == LIT_UTF8_1_BYTE_MARKER)
     {
       continue;
@@ -166,7 +166,7 @@ lit_is_cesu8_string_valid (const lit_utf8_byte_t *utf8_buf_p, /**< utf-8 string
 
     for (lit_utf8_size_t offset = 0; offset < extra_bytes_count; ++offset)
     {
-      c = utf8_buf_p[idx + offset];
+      c = cesu8_buf_p[idx + offset];
       if ((c & LIT_UTF8_EXTRA_BYTE_MASK) != LIT_UTF8_EXTRA_BYTE_MARKER)
       {
         /* invalid continuation byte */

jerry-core/lit/lit-strings.h

@@ -86,7 +86,7 @@
 
 /* validation */
 bool lit_is_utf8_string_valid (const lit_utf8_byte_t *utf8_buf_p, lit_utf8_size_t buf_size);
-bool lit_is_cesu8_string_valid (const lit_utf8_byte_t *utf8_buf_p, lit_utf8_size_t buf_size);
+bool lit_is_cesu8_string_valid (const lit_utf8_byte_t *cesu8_buf_p, lit_utf8_size_t buf_size);
 
 /* checks */
 bool lit_is_code_point_utf16_low_surrogate (lit_code_point_t code_point);

jerry-main/main-unix.c

@@ -663,6 +663,12 @@ main (int argc,
         break;
       }
 
+      if (!jerry_is_utf8_string_valid (source_p, (jerry_size_t) source_size))
+      {
+        ret_value = jerry_create_error (JERRY_ERROR_COMMON, (jerry_char_t *) ("Input must be a valid UTF-8 string."));
+        break;
+      }
+
       if (jerry_is_feature_enabled (JERRY_FEATURE_SNAPSHOT_SAVE) && (is_save_snapshot_mode || is_save_literals_mode))
       {
         static uint8_t snapshot_save_buffer[ JERRY_BUFFER_SIZE ];
@@ -686,6 +692,7 @@ main (int argc,
             fclose (snapshot_file_p);
           }
         }
+
         if (!jerry_value_has_error_flag (ret_value) && is_save_literals_mode)
         {
           const size_t literal_buffer_size = jerry_parse_and_save_literals ((jerry_char_t *) source_p,

tests/jerry/fail/1/regression-test-issue-1549.js

@@ -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.
+
+va'Ôc=