Change -EOF for EOF (it is worth -1), fix assertion

[babeltrace.git] / formats / ctf / types / string.c

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 125e7b3b484814b3b3620044d006357b8df02c3f..197a7e135f276825ae9e29f85a70b20636755c13 100644 (file)
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -16,60 +16,71 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf/types.h>
 #include <limits.h>            /* C99 limits */
 #include <string.h>
 
-void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-                    const struct type_string *string_type)
+int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 {
+       struct definition_string *string_definition =
+               container_of(definition, struct definition_string, p);
+       const struct declaration_string *string_declaration =
+               string_definition->declaration;
+       struct ctf_stream_pos *pos = ctf_pos(ppos);
        size_t len;
-       char *destaddr, *srcaddr;
+       ssize_t max_len;
+       char *srcaddr;
 
-       align_pos(src, string_type->p.alignment);
-       srcaddr = get_pos_addr(src);
-       len = strlen(srcaddr) + 1;
-       if (dest->dummy)
-               goto end;
-       align_pos(dest, string_type->p.alignment);
-       destaddr = get_pos_addr(dest);
-       strcpy(destaddr, srcaddr);
-end:
-       move_pos(dest, len);
-       move_pos(src, len);
-}
+       ctf_align_pos(pos, string_declaration->p.alignment);
 
-void ctf_string_read(char **dest, struct stream_pos *src,
-                    const struct type_string *string_type)
-{
-       size_t len;
-       char *srcaddr;
+       srcaddr = ctf_get_pos_addr(pos);
+       if (pos->offset == EOF)
+               return -EFAULT;
+       /* Not counting \0 */
+       max_len = pos->packet_size - pos->offset - 1;
+       if (max_len < 0)
+               return -EFAULT;
+       len = strnlen(srcaddr, max_len) + 1;    /* Add \0 */
+       /* Truncated string, unexpected. Trace probably corrupted. */
+       if (srcaddr[len - 1] != '\0')
+               return -EFAULT;
 
-       align_pos(src, string_type->p.alignment);
-       srcaddr = get_pos_addr(src);
-       len = strlen(srcaddr) + 1;
-       *dest = g_realloc(*dest, len);
-       strcpy(*dest, srcaddr);
-       move_pos(src, len);
+       if (string_definition->alloc_len < len) {
+               string_definition->value =
+                       g_realloc(string_definition->value, len);
+               string_definition->alloc_len = len;
+       }
+       printf_debug("CTF string read %s\n", srcaddr);
+       memcpy(string_definition->value, srcaddr, len);
+       string_definition->len = len;
+       ctf_move_pos(pos, len * CHAR_BIT);
+       return 0;
 }
 
-void ctf_string_write(struct stream_pos *dest, const char *src,
-                     const struct type_string *string_type)
+int ctf_string_write(struct stream_pos *ppos,
+                     struct definition *definition)
 {
+       struct definition_string *string_definition =
+               container_of(definition, struct definition_string, p);
+       const struct declaration_string *string_declaration =
+               string_definition->declaration;
+       struct ctf_stream_pos *pos = ctf_pos(ppos);
        size_t len;
        char *destaddr;
 
-       align_pos(dest, string_type->p.alignment);
-       len = strlen(src) + 1;
-       if (dest->dummy)
+       ctf_align_pos(pos, string_declaration->p.alignment);
+       assert(string_definition->value != NULL);
+       len = string_definition->len;
+
+       if (!ctf_pos_access_ok(pos, len))
+               return -EFAULT;
+
+       if (pos->dummy)
                goto end;
-       destaddr = get_pos_addr(dest);
-       strcpy(destaddr, src);
+       destaddr = ctf_get_pos_addr(pos);
+       memcpy(destaddr, string_definition->value, len);
 end:
-       move_pos(dest, len);
-}
-
-void ctf_string_free_temp(char *string)
-{
-       g_free(string);
+       ctf_move_pos(pos, len * CHAR_BIT);
+       return 0;
 }