From f478e161e6bdde0adb9ee14454478c79624328ee Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Fri, 19 Sep 2014 16:15:42 +0400 Subject: [PATCH] Fixing ecma_string_to_zt_string and ecma_copy_zt_string_to_buffer routines. --- src/libecmaobjects/ecma-helpers-string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libecmaobjects/ecma-helpers-string.c b/src/libecmaobjects/ecma-helpers-string.c index 33b0c456a..97ece3b6d 100644 --- a/src/libecmaobjects/ecma-helpers-string.c +++ b/src/libecmaobjects/ecma-helpers-string.c @@ -477,7 +477,7 @@ ecma_string_to_zt_string (const ecma_string_t *string_desc_p, /**< ecma-string d ecma_length_t chars_left = string_length; while (chars_left > 0) { - JERRY_ASSERT(chars_left < string_length); + JERRY_ASSERT(chars_left <= string_length); ecma_length_t chars_to_copy = JERRY_MIN(max_chars_in_chunk, chars_left); @@ -1150,14 +1150,13 @@ ecma_copy_zt_string_to_buffer (const ecma_char_t *string_p, /**< zero-terminated ecma_char_t *buf_iter_p = buffer_p; ssize_t bytes_copied = 0; - do + while (*str_iter_p != ECMA_CHAR_NULL) { bytes_copied += (ssize_t) sizeof (ecma_char_t); JERRY_ASSERT (bytes_copied <= buffer_size); *buf_iter_p++ = *str_iter_p++; } - while (*str_iter_p != ECMA_CHAR_NULL); bytes_copied += (ssize_t) sizeof (ecma_char_t); JERRY_ASSERT (bytes_copied <= buffer_size);