Skip to content

Commit f1817ec

Browse files
lygstatelygstate
committed
Fixes ecma_uint32_to_utf8_string that fill \0 at the end of string
Closes: jerryscript-project#5194 JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
1 parent c509a06 commit f1817ec

7 files changed

+52
-26
lines changed

‎jerry-core/api/jerry-snapshot.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -1507,11 +1507,13 @@ jerry_append_number_to_buffer (uint8_t *buffer_p, /**< buffer */
15071507
uint8_t *buffer_end_p, /**< the end of the buffer */
15081508
lit_utf8_size_t number) /**< number */
15091509
{
1510-
lit_utf8_byte_t uint32_to_str_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
1510+
lit_utf8_byte_t uint32_to_str_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
15111511
lit_utf8_size_t utf8_str_size =
1512-
ecma_uint32_to_utf8_string (number, uint32_to_str_buffer, ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1512+
ecma_uint32_to_utf8_string (number,
1513+
uint32_to_str_buffer,
1514+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
15131515

1514-
JERRY_ASSERT (utf8_str_size <= ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1516+
JERRY_ASSERT (utf8_str_size < ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
15151517

15161518
return jerry_append_chars_to_buffer (buffer_p,
15171519
buffer_end_p,

‎jerry-core/ecma/base/ecma-globals.h

+6
Original file line numberDiff line numberDiff line change
@@ -1379,6 +1379,12 @@ typedef float ecma_number_t;
13791379
*/
13801380
#define ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32 10
13811381

1382+
/**
1383+
* Maximum number of characters in string representation of ecma-uint32 plus one.
1384+
* That is the '\0' terminator
1385+
*/
1386+
#define ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED (ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32 + 1)
1387+
13821388
/**
13831389
* String is not a valid array index.
13841390
*/

‎jerry-core/ecma/base/ecma-helpers-conversion.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,8 @@ ecma_uint32_to_utf8_string (uint32_t value, /**< value to convert */
659659
lit_utf8_byte_t *out_buffer_p, /**< buffer for string */
660660
lit_utf8_size_t buffer_size) /**< size of buffer */
661661
{
662-
lit_utf8_byte_t *buf_p = out_buffer_p + buffer_size;
662+
lit_utf8_byte_t *buf_p_tail = out_buffer_p + buffer_size - 1;
663+
lit_utf8_byte_t *buf_p = buf_p_tail;
663664

664665
do
665666
{
@@ -672,12 +673,13 @@ ecma_uint32_to_utf8_string (uint32_t value, /**< value to convert */
672673

673674
JERRY_ASSERT (buf_p >= out_buffer_p);
674675

675-
lit_utf8_size_t bytes_copied = (lit_utf8_size_t) (out_buffer_p + buffer_size - buf_p);
676+
lit_utf8_size_t bytes_copied = (lit_utf8_size_t) (buf_p_tail - buf_p);
676677

677678
if (JERRY_LIKELY (buf_p != out_buffer_p))
678679
{
679680
memmove (out_buffer_p, buf_p, bytes_copied);
680681
}
682+
buf_p[bytes_copied] = '\0';
681683

682684
return bytes_copied;
683685
} /* ecma_uint32_to_utf8_string */
@@ -865,7 +867,7 @@ ecma_number_to_utf8_string (ecma_number_t num, /**< ecma-number */
865867
if (((ecma_number_t) num_uint32) == num)
866868
{
867869
dst_p += ecma_uint32_to_utf8_string (num_uint32, dst_p, (lit_utf8_size_t) (buffer_p + buffer_size - dst_p));
868-
JERRY_ASSERT (dst_p <= buffer_p + buffer_size);
870+
JERRY_ASSERT (dst_p < buffer_p + buffer_size);
869871
return (lit_utf8_size_t) (dst_p - buffer_p);
870872
}
871873

@@ -932,7 +934,7 @@ ecma_number_to_utf8_string (ecma_number_t num, /**< ecma-number */
932934

933935
dst_p += ecma_uint32_to_utf8_string (t, dst_p, (lit_utf8_size_t) (buffer_p + buffer_size - dst_p));
934936

935-
JERRY_ASSERT (dst_p <= buffer_p + buffer_size);
937+
JERRY_ASSERT (dst_p < buffer_p + buffer_size);
936938

937939
return (lit_utf8_size_t) (dst_p - buffer_p);
938940
} /* ecma_number_to_utf8_string */

‎jerry-core/ecma/base/ecma-helpers-string.c

+21-18
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ ecma_append_chars_to_string (ecma_string_t *string1_p, /**< base ecma-string */
726726
lit_utf8_size_t cesu8_string1_size;
727727
lit_utf8_size_t cesu8_string1_length;
728728
uint8_t flags = ECMA_STRING_FLAG_IS_ASCII;
729-
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
729+
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
730730

731731
const lit_utf8_byte_t *cesu8_string1_p =
732732
ecma_string_get_chars (string1_p, &cesu8_string1_size, &cesu8_string1_length, uint32_to_string_buffer, &flags);
@@ -831,7 +831,7 @@ ecma_concat_ecma_strings (ecma_string_t *string1_p, /**< first ecma-string */
831831

832832
lit_utf8_size_t cesu8_string2_size;
833833
lit_utf8_size_t cesu8_string2_length;
834-
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
834+
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
835835
uint8_t flags = ECMA_STRING_FLAG_IS_ASCII;
836836

837837
const lit_utf8_byte_t *cesu8_string2_p =
@@ -1081,8 +1081,9 @@ ecma_uint32_to_buffer (uint32_t num, /**< number */
10811081
lit_utf8_byte_t *buffer_p /**< destination buffer */,
10821082
lit_utf8_size_t buffer_size /**< buffer size */)
10831083
{
1084-
lit_utf8_byte_t digits[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
1085-
lit_utf8_size_t digit_count = ecma_uint32_to_utf8_string (num, digits, ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1084+
lit_utf8_byte_t digits[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
1085+
lit_utf8_size_t digit_count =
1086+
ecma_uint32_to_utf8_string (num, digits, ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
10861087

10871088
digit_count = JERRY_MIN (buffer_size, digit_count);
10881089
memcpy (buffer_p, digits, digit_count);
@@ -1192,7 +1193,7 @@ ecma_string_to_cesu8_bytes (const ecma_string_t *string_desc_p, /**< ecma-string
11921193
*
11931194
* @return size in bytes
11941195
*/
1195-
static inline lit_utf8_size_t JERRY_ATTR_ALWAYS_INLINE
1196+
extern inline lit_utf8_size_t JERRY_ATTR_ALWAYS_INLINE
11961197
ecma_string_get_uint32_size (const uint32_t uint32_number) /**< number in the string-descriptor */
11971198
{
11981199
uint32_t prev_number = 1;
@@ -1292,11 +1293,11 @@ ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
12921293
}
12931294
else
12941295
{
1295-
result_p = (const lit_utf8_byte_t *) jmem_heap_alloc_block (size);
1296+
result_p = (const lit_utf8_byte_t *) jmem_heap_alloc_block (size + 1);
12961297
*flags_p |= ECMA_STRING_FLAG_MUST_BE_FREED;
12971298
}
12981299

1299-
length = ecma_uint32_to_utf8_string (uint32_number, (lit_utf8_byte_t *) result_p, size);
1300+
length = ecma_uint32_to_utf8_string (uint32_number, (lit_utf8_byte_t *) result_p, size + 1);
13001301

13011302
JERRY_ASSERT (length == size);
13021303
*flags_p |= ECMA_STRING_FLAG_IS_UINT32;
@@ -1343,11 +1344,11 @@ ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
13431344
}
13441345
else
13451346
{
1346-
result_p = (const lit_utf8_byte_t *) jmem_heap_alloc_block (size);
1347+
result_p = (const lit_utf8_byte_t *) jmem_heap_alloc_block (size + 1);
13471348
*flags_p |= ECMA_STRING_FLAG_MUST_BE_FREED;
13481349
}
13491350

1350-
length = ecma_uint32_to_utf8_string (string_p->u.uint32_number, (lit_utf8_byte_t *) result_p, size);
1351+
length = ecma_uint32_to_utf8_string (string_p->u.uint32_number, (lit_utf8_byte_t *) result_p, size + 1);
13511352

13521353
JERRY_ASSERT (length == size);
13531354
*flags_p |= ECMA_STRING_FLAG_IS_UINT32 | ECMA_STRING_FLAG_REHASH_NEEDED;
@@ -1716,8 +1717,8 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
17161717
const lit_utf8_byte_t *utf8_string1_p, *utf8_string2_p;
17171718
lit_utf8_size_t utf8_string1_size, utf8_string2_size;
17181719

1719-
lit_utf8_byte_t uint32_to_string_buffer1[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
1720-
lit_utf8_byte_t uint32_to_string_buffer2[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
1720+
lit_utf8_byte_t uint32_to_string_buffer1[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
1721+
lit_utf8_byte_t uint32_to_string_buffer2[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
17211722

17221723
if (ECMA_IS_DIRECT_STRING (string1_p))
17231724
{
@@ -1729,7 +1730,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
17291730
{
17301731
utf8_string1_size = ecma_uint32_to_utf8_string ((uint32_t) ECMA_GET_DIRECT_STRING_VALUE (string1_p),
17311732
uint32_to_string_buffer1,
1732-
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1733+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
17331734
utf8_string1_p = uint32_to_string_buffer1;
17341735
}
17351736
}
@@ -1745,7 +1746,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
17451746
{
17461747
utf8_string1_size = ecma_uint32_to_utf8_string (string1_p->u.uint32_number,
17471748
uint32_to_string_buffer1,
1748-
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1749+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
17491750
utf8_string1_p = uint32_to_string_buffer1;
17501751
}
17511752
}
@@ -1760,7 +1761,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
17601761
{
17611762
utf8_string2_size = ecma_uint32_to_utf8_string ((uint32_t) ECMA_GET_DIRECT_STRING_VALUE (string2_p),
17621763
uint32_to_string_buffer2,
1763-
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1764+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
17641765
utf8_string2_p = uint32_to_string_buffer2;
17651766
}
17661767
}
@@ -1776,7 +1777,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
17761777
{
17771778
utf8_string2_size = ecma_uint32_to_utf8_string (string2_p->u.uint32_number,
17781779
uint32_to_string_buffer2,
1779-
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
1780+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
17801781
utf8_string2_p = uint32_to_string_buffer2;
17811782
}
17821783
}
@@ -2061,7 +2062,7 @@ ecma_string_get_char_at_pos (const ecma_string_t *string_p, /**< ecma-string */
20612062
{
20622063
JERRY_ASSERT (index < ecma_string_get_length (string_p));
20632064

2064-
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32];
2065+
lit_utf8_byte_t uint32_to_string_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED];
20652066

20662067
if (ECMA_IS_DIRECT_STRING (string_p))
20672068
{
@@ -2086,7 +2087,9 @@ ecma_string_get_char_at_pos (const ecma_string_t *string_p, /**< ecma-string */
20862087
JERRY_ASSERT (ECMA_GET_DIRECT_STRING_TYPE (string_p) == ECMA_DIRECT_STRING_UINT);
20872088
uint32_t uint32_number = (uint32_t) ECMA_GET_DIRECT_STRING_VALUE (string_p);
20882089

2089-
ecma_uint32_to_utf8_string (uint32_number, uint32_to_string_buffer, ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
2090+
ecma_uint32_to_utf8_string (uint32_number,
2091+
uint32_to_string_buffer,
2092+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
20902093

20912094
return (ecma_char_t) uint32_to_string_buffer[index];
20922095
}
@@ -2132,7 +2135,7 @@ ecma_string_get_char_at_pos (const ecma_string_t *string_p, /**< ecma-string */
21322135
{
21332136
ecma_uint32_to_utf8_string (string_p->u.uint32_number,
21342137
uint32_to_string_buffer,
2135-
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
2138+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
21362139

21372140
return (ecma_char_t) uint32_to_string_buffer[index];
21382141
}

‎jerry-core/ecma/base/ecma-helpers.h

+1
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ ecma_number_t ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p,
508508
lit_utf8_size_t str_size,
509509
uint32_t radix,
510510
uint32_t option);
511+
lit_utf8_size_t ecma_string_get_uint32_size (const uint32_t uint32_number);
511512
lit_utf8_size_t ecma_uint32_to_utf8_string (uint32_t value, lit_utf8_byte_t *out_buffer_p, lit_utf8_size_t buffer_size);
512513
uint32_t ecma_number_to_uint32 (ecma_number_t num);
513514
int32_t ecma_number_to_int32 (ecma_number_t num);

‎jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num,
525525
}
526526

527527
/* Append exponent part */
528-
lit_utf8_size_t exp_size = ecma_uint32_to_utf8_string ((uint32_t) exponent, digits, 3);
528+
lit_utf8_size_t exp_size = ecma_uint32_to_utf8_string ((uint32_t) exponent, digits, 3 + 1);
529529
ecma_stringbuilder_append_raw (&builder, digits, exp_size);
530530

531531
return ecma_make_string_value (ecma_stringbuilder_finalize (&builder));

‎tests/unit-core/test-number-to-string.c

+12
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,17 @@ main (void)
5050
}
5151
}
5252

53+
lit_utf8_byte_t val_uint32_max_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED] = { 0 };
54+
memset (val_uint32_max_buffer, 0xFF, sizeof (val_uint32_max_buffer));
55+
56+
TEST_ASSERT (ecma_string_get_uint32_size (UINT32_MAX) == 10);
57+
TEST_ASSERT (ecma_string_get_uint32_size (0) == 1);
58+
TEST_ASSERT (ecma_string_get_uint32_size (10) == 2);
59+
lit_utf8_size_t digits = ecma_uint32_to_utf8_string (UINT32_MAX,
60+
val_uint32_max_buffer,
61+
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32_WITH_ZERO_TERMINATED);
62+
TEST_ASSERT (digits == 10);
63+
TEST_ASSERT (val_uint32_max_buffer[ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32] == 0);
64+
5365
return 0;
5466
} /* main */

0 commit comments

Comments
 (0)