Fix assertion 'bytes_copied > 0 || !string_len' in JSON.stringify()

JerryScript-DCO-1.0-Signed-off-by: Roland Takacs [email protected]

Author: Roland Takacs

jerry-core/ecma/builtin-objects/ecma-builtin-json.cpp

@@ -1117,11 +1117,11 @@ ecma_builtin_json_stringify (ecma_value_t this_arg __attr_unused___, /**< 'this'
     {
       ecma_length_t string_len = ecma_string_get_length (space_str_p);
 
-      MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len, lit_utf8_byte_t);
+      MEM_DEFINE_LOCAL_ARRAY (string_buff, string_len, lit_utf8_byte_t);
 
       size_t string_buf_size = (size_t) (string_len) * sizeof (lit_utf8_byte_t);
       ssize_t bytes_copied = ecma_string_to_utf8_string (space_str_p,
-                                                         zt_string_buff,
+                                                         string_buff,
                                                          (ssize_t) string_buf_size);
       JERRY_ASSERT (bytes_copied > 0);
 
@@ -1130,13 +1130,13 @@ ecma_builtin_json_stringify (ecma_value_t this_arg __attr_unused___, /**< 'this'
 
       for (uint32_t i = 0; i < 10; i++)
       {
-        space_buff[i] = zt_string_buff[i];
+        space_buff[i] = string_buff[i];
       }
 
       context_p.gap_str_p = ecma_new_ecma_string_from_utf8 ((lit_utf8_byte_t *) space_buff, 10);
 
       MEM_FINALIZE_LOCAL_ARRAY (space_buff);
-      MEM_FINALIZE_LOCAL_ARRAY (zt_string_buff);
+      MEM_FINALIZE_LOCAL_ARRAY (string_buff);
     }
   }
   /* 8. */
@@ -1198,23 +1198,24 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
   ecma_string_t *product_str_p = ecma_copy_or_ref_ecma_string (quote_str_p);
   ecma_string_t *tmp_str_p;
 
-  ecma_length_t string_len = ecma_string_get_length (string_p);
+  ecma_length_t string_size = ecma_string_get_size (string_p);
 
-  MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len, lit_utf8_byte_t);
+  MEM_DEFINE_LOCAL_ARRAY (string_buff, string_size, lit_utf8_byte_t);
 
-  size_t string_buf_size = (size_t) (string_len) * sizeof (lit_utf8_byte_t);
   ssize_t bytes_copied = ecma_string_to_utf8_string (string_p,
-                                                     zt_string_buff,
-                                                     (ssize_t) string_buf_size);
-  JERRY_ASSERT (bytes_copied > 0 || !string_len);
+                                                     string_buff,
+                                                     (ssize_t) string_size);
 
-  /* 2. */
-  for (ecma_length_t i = 0; i < string_len; i++)
+  JERRY_ASSERT (bytes_copied > 0 || !string_size);
+
+  lit_utf8_iterator_t iter = lit_utf8_iterator_create (string_buff, string_size);
+
+  while (!lit_utf8_iterator_is_eos (&iter))
   {
-    lit_utf8_byte_t c = zt_string_buff[i];
+    ecma_char_t current_char = lit_utf8_iterator_read_next (&iter);
 
     /* 2.a */
-    if (c == LIT_CHAR_BACKSLASH || c == LIT_CHAR_DOUBLE_QUOTE)
+    if (current_char == LIT_CHAR_BACKSLASH || current_char == LIT_CHAR_DOUBLE_QUOTE)
     {
       ecma_string_t *backslash_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_BACKSLASH_CHAR);
 
@@ -1225,16 +1226,19 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
       product_str_p = tmp_str_p;
 
       /* 2.a.ii */
-      ecma_string_t *c_str_p = ecma_new_ecma_string_from_utf8 (&c, 1);
+      ecma_string_t *current_char_str_p = ecma_new_ecma_string_from_code_unit (current_char);
 
-      tmp_str_p = ecma_concat_ecma_strings (product_str_p, c_str_p);
+      tmp_str_p = ecma_concat_ecma_strings (product_str_p, current_char_str_p);
       ecma_deref_ecma_string (product_str_p);
-      ecma_deref_ecma_string (c_str_p);
+      ecma_deref_ecma_string (current_char_str_p);
       product_str_p = tmp_str_p;
     }
     /* 2.b */
-    else if (c == LIT_CHAR_BS || c == LIT_CHAR_FF || c == LIT_CHAR_LF
-             || c == LIT_CHAR_CR || c == LIT_CHAR_TAB)
+    else if (current_char == LIT_CHAR_BS
+             || current_char == LIT_CHAR_FF
+             || current_char == LIT_CHAR_LF
+             || current_char == LIT_CHAR_CR
+             || current_char == LIT_CHAR_TAB)
     {
       ecma_string_t *backslash_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_BACKSLASH_CHAR);
 
@@ -1247,7 +1251,7 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
       /* 2.b.ii */
       lit_utf8_byte_t abbrev = LIT_CHAR_SP;
 
-      switch (c)
+      switch (current_char)
       {
         case LIT_CHAR_BS:
         {
@@ -1285,7 +1289,7 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
       product_str_p = tmp_str_p;
     }
     /* 2.c */
-    else if (c < LIT_CHAR_SP)
+    else if (current_char < LIT_CHAR_SP)
     {
       ecma_string_t *backslash_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_BACKSLASH_CHAR);
 
@@ -1305,7 +1309,7 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
       product_str_p = tmp_str_p;
 
       /* 2.c.iii */
-      ecma_string_t *hex_str_p = ecma_builtin_helper_json_create_hex_digit_ecma_string (c);
+      ecma_string_t *hex_str_p = ecma_builtin_helper_json_create_hex_digit_ecma_string ( (uint8_t) current_char);
 
       /* 2.c.iv */
       tmp_str_p = ecma_concat_ecma_strings (product_str_p, hex_str_p);
@@ -1316,16 +1320,16 @@ ecma_builtin_json_quote (ecma_string_t *string_p) /**< string that should be quo
     /* 2.d */
     else
     {
-      ecma_string_t *c_str_p = ecma_new_ecma_string_from_utf8 (&c, 1);
+      ecma_string_t *current_char_str_p = ecma_new_ecma_string_from_code_unit (current_char);
 
-      tmp_str_p = ecma_concat_ecma_strings (product_str_p, c_str_p);
+      tmp_str_p = ecma_concat_ecma_strings (product_str_p, current_char_str_p);
       ecma_deref_ecma_string (product_str_p);
-      ecma_deref_ecma_string (c_str_p);
+      ecma_deref_ecma_string (current_char_str_p);
       product_str_p = tmp_str_p;
     }
   }
 
-  MEM_FINALIZE_LOCAL_ARRAY (zt_string_buff);
+  MEM_FINALIZE_LOCAL_ARRAY (string_buff);
 
   /* 3. */
   tmp_str_p = ecma_concat_ecma_strings (product_str_p, quote_str_p);

tests/jerry/json-stringify.js

@@ -28,6 +28,9 @@ assert (JSON.stringify (ctl_string) == '"asd\\u001fasd"');
 escpad_string = "\"asda\sd";
 assert (JSON.stringify (escpad_string) == '"\\"asdasd"');
 
+assert (JSON.stringify('\u2040') == '"⁀"');
+assert (JSON.stringify('abc\u2040\u2030cba') == '"abc⁀‰cba"');
+
 // Checking primitive types
 assert (JSON.stringify (1) === '1');
 assert (JSON.stringify (true) === 'true');