fix double-free on error path

[babeltrace.git] / converter / babeltrace-log.c

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 53826c33ee32e12838e952ac680a5127c41fe985..9d87776a8f361ade58a7557215d99fe8a56916fd 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -20,6 +20,7 @@
  * Depends on glibc 2.10 for getline().
  */
 
+#define _GNU_SOURCE
 #include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -31,31 +32,29 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
-#include <uuid/uuid.h>
 #include <string.h>
-#include <endian.h>
+#include <inttypes.h>
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
 
 #define USEC_PER_SEC 1000000UL
 
-#ifndef UUID_STR_LEN
-#define UUID_STR_LEN   37      /* With \0 */
-#endif
-
 int babeltrace_debug, babeltrace_verbose;
 
 static char *s_outputname;
 static int s_timestamp;
 static int s_help;
-static uuid_t s_uuid;
+static unsigned char s_uuid[BABELTRACE_UUID_LEN];
 
 /* Metadata format string */
 static const char metadata_fmt[] =
 "/* CTF 1.8 */\n"
 "typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n"
 "typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n"
+"typealias integer { size = 64; align = 64; signed = false; } := uint64_t;\n"
 "\n"
 "trace {\n"
 "      major = %u;\n"                  /* major (e.g. 0) */
@@ -70,8 +69,8 @@ static const char metadata_fmt[] =
 "\n"
 "stream {\n"
 "      packet.context := struct {\n"
-"              uint32_t content_size;\n"
-"              uint32_t packet_size;\n"
+"              uint64_t content_size;\n"
+"              uint64_t packet_size;\n"
 "      };\n"
 "%s"                                   /* Stream event header (opt.) */
 "};\n"
@@ -90,14 +89,14 @@ static const char metadata_stream_event_header_timestamp[] =
 static
 void print_metadata(FILE *fp)
 {
-       char uuid_str[UUID_STR_LEN];
+       char uuid_str[BABELTRACE_UUID_STR_LEN];
        unsigned int major = 0, minor = 0;
        int ret;
 
        ret = sscanf(VERSION, "%u.%u", &major, &minor);
        if (ret != 2)
                fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
-       uuid_unparse(s_uuid, uuid_str);
+       babeltrace_uuid_unparse(s_uuid, uuid_str);
        fprintf(fp, metadata_fmt,
                major,
                minor,
@@ -107,7 +106,7 @@ void print_metadata(FILE *fp)
 }
 
 static
-void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid)
+void write_packet_header(struct ctf_stream_pos *pos, unsigned char *uuid)
 {
        struct ctf_stream_pos dummy;
 
@@ -128,8 +127,8 @@ void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid)
        assert(!ctf_pos_packet(&dummy));
 
        ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
-       memcpy(ctf_get_pos_addr(pos), uuid, 16);
-       ctf_move_pos(pos, 16 * CHAR_BIT);
+       memcpy(ctf_get_pos_addr(pos), uuid, BABELTRACE_UUID_LEN);
+       ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT);
 }
 
 static
@@ -139,24 +138,24 @@ void write_packet_context(struct ctf_stream_pos *pos)
 
        /* content_size */
        ctf_dummy_pos(pos, &dummy);
-       ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
-       ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
+       ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+       ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        assert(!ctf_pos_packet(&dummy));
        
-       ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
-       *(uint32_t *) ctf_get_pos_addr(pos) = -1U;      /* Not known yet */
-       pos->content_size_loc = (uint32_t *) ctf_get_pos_addr(pos);
-       ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+       ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+       *(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL;    /* Not known yet */
+       pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos);
+       ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
 
        /* packet_size */
        ctf_dummy_pos(pos, &dummy);
-       ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
-       ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
+       ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+       ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        assert(!ctf_pos_packet(&dummy));
        
-       ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
-       *(uint32_t *) ctf_get_pos_addr(pos) = pos->packet_size;
-       ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+       ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+       *(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size;
+       ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
 }
 
 static
@@ -212,7 +211,7 @@ retry:
                write_packet_header(pos, s_uuid);
                write_packet_context(pos);
                if (attempt++ == 1) {
-                       fprintf(stderr, "[Error] Line too large for packet size (%zukB) (discarded)\n",
+                       fprintf(stderr, "[Error] Line too large for packet size (%" PRIu64 "kB) (discarded)\n",
                                pos->packet_size / CHAR_BIT / 1024);
                        return;
                }
@@ -232,9 +231,14 @@ void trace_text(FILE *input, int output)
        ssize_t len;
        char *line = NULL, *nl;
        size_t linesize;
+       int ret;
 
-       ctf_init_pos(&pos, output, O_RDWR);
-
+       memset(&pos, 0, sizeof(pos));
+       ret = ctf_init_pos(&pos, output, O_RDWR);
+       if (ret) {
+               fprintf(stderr, "Error in ctf_init_pos\n");
+               return;
+       }
        write_packet_header(&pos, s_uuid);
        write_packet_context(&pos);
        for (;;) {
@@ -242,11 +246,17 @@ void trace_text(FILE *input, int output)
                if (len < 0)
                        break;
                nl = strrchr(line, '\n');
-               if (nl)
+               if (nl) {
                        *nl = '\0';
-               trace_string(line, &pos, nl - line + 1);
+                       trace_string(line, &pos, nl - line + 1);
+               } else {
+                       trace_string(line, &pos, strlen(line) + 1);
+               }
+       }
+       ret = ctf_fini_pos(&pos);
+       if (ret) {
+               fprintf(stderr, "Error in ctf_fini_pos\n");
        }
-       ctf_fini_pos(&pos);
 }
 
 static
@@ -340,11 +350,13 @@ int main(int argc, char **argv)
                goto error_closemetadatafd;
        }
 
-       uuid_generate(s_uuid);
+       babeltrace_uuid_generate(s_uuid);
        print_metadata(metadata_fp);
        trace_text(stdin, fd);
 
-       close(fd);
+       ret = close(fd);
+       if (ret)
+               perror("close");
        exit(EXIT_SUCCESS);
 
        /* error handling */