projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d3470774c589a22b143232b58add5df9f892c85b..9d87776a8f361ade58a7557215d99fe8a56916fd 100644
(file)
--- a/
converter/babeltrace-log.c
+++ b/
converter/babeltrace-log.c
@@
-20,6
+20,7
@@
* Depends on glibc 2.10 for getline().
*/
* Depends on glibc 2.10 for getline().
*/
+#define _GNU_SOURCE
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-32,6
+33,7
@@
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
+#include <inttypes.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
@@
-52,6
+54,7
@@
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"
"/* 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) */
"\n"
"trace {\n"
" major = %u;\n" /* major (e.g. 0) */
@@
-66,8
+69,8
@@
static const char metadata_fmt[] =
"\n"
"stream {\n"
" packet.context := struct {\n"
"\n"
"stream {\n"
" packet.context := struct {\n"
-" uint
32
_t content_size;\n"
-" uint
32
_t packet_size;\n"
+" uint
64
_t content_size;\n"
+" uint
64
_t packet_size;\n"
" };\n"
"%s" /* Stream event header (opt.) */
"};\n"
" };\n"
"%s" /* Stream event header (opt.) */
"};\n"
@@
-135,24
+138,24
@@
void write_packet_context(struct ctf_stream_pos *pos)
/* content_size */
ctf_dummy_pos(pos, &dummy);
/* content_size */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint
32
_t) * CHAR_BIT);
- ctf_move_pos(&dummy, sizeof(uint
32
_t) * CHAR_BIT);
+ ctf_align_pos(&dummy, sizeof(uint
64
_t) * CHAR_BIT);
+ ctf_move_pos(&dummy, sizeof(uint
64
_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint
32
_t) * CHAR_BIT);
- *(uint
32_t *) ctf_get_pos_addr(pos) = -1U;
/* Not known yet */
- pos->content_size_loc = (uint
32
_t *) ctf_get_pos_addr(pos);
- ctf_move_pos(pos, sizeof(uint
32
_t) * CHAR_BIT);
+ ctf_align_pos(pos, sizeof(uint
64
_t) * CHAR_BIT);
+ *(uint
64_t *) ctf_get_pos_addr(pos) = ~0ULL;
/* Not known yet */
+ pos->content_size_loc = (uint
64
_t *) ctf_get_pos_addr(pos);
+ ctf_move_pos(pos, sizeof(uint
64
_t) * CHAR_BIT);
/* packet_size */
ctf_dummy_pos(pos, &dummy);
/* packet_size */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint
32
_t) * CHAR_BIT);
- ctf_move_pos(&dummy, sizeof(uint
32
_t) * CHAR_BIT);
+ ctf_align_pos(&dummy, sizeof(uint
64
_t) * CHAR_BIT);
+ ctf_move_pos(&dummy, sizeof(uint
64
_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint
32
_t) * CHAR_BIT);
- *(uint
32
_t *) ctf_get_pos_addr(pos) = pos->packet_size;
- ctf_move_pos(pos, sizeof(uint
32
_t) * CHAR_BIT);
+ ctf_align_pos(pos, sizeof(uint
64
_t) * CHAR_BIT);
+ *(uint
64
_t *) ctf_get_pos_addr(pos) = pos->packet_size;
+ ctf_move_pos(pos, sizeof(uint
64
_t) * CHAR_BIT);
}
static
}
static
@@
-208,7
+211,7
@@
retry:
write_packet_header(pos, s_uuid);
write_packet_context(pos);
if (attempt++ == 1) {
write_packet_header(pos, s_uuid);
write_packet_context(pos);
if (attempt++ == 1) {
- fprintf(stderr, "[Error] Line too large for packet size (%
zu
kB) (discarded)\n",
+ fprintf(stderr, "[Error] Line too large for packet size (%
" PRIu64 "
kB) (discarded)\n",
pos->packet_size / CHAR_BIT / 1024);
return;
}
pos->packet_size / CHAR_BIT / 1024);
return;
}
@@
-228,9
+231,14
@@
void trace_text(FILE *input, int output)
ssize_t len;
char *line = NULL, *nl;
size_t linesize;
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 (;;) {
write_packet_header(&pos, s_uuid);
write_packet_context(&pos);
for (;;) {
@@
-238,11
+246,17
@@
void trace_text(FILE *input, int output)
if (len < 0)
break;
nl = strrchr(line, '\n');
if (len < 0)
break;
nl = strrchr(line, '\n');
- if (nl)
+ if (nl)
{
*nl = '\0';
*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
}
static
@@
-340,7
+354,9
@@
int main(int argc, char **argv)
print_metadata(metadata_fp);
trace_text(stdin, fd);
print_metadata(metadata_fp);
trace_text(stdin, fd);
- close(fd);
+ ret = close(fd);
+ if (ret)
+ perror("close");
exit(EXIT_SUCCESS);
/* error handling */
exit(EXIT_SUCCESS);
/* error handling */
This page took
0.024916 seconds
and
4
git commands to generate.