{
struct metadata_packet_header header;
size_t readlen, writelen, toread;
- char buf[4096];
+ char buf[4096 + 1]; /* + 1 for debug-mode \0 */
int ret = 0;
readlen = fread(&header, header_sizeof(header), 1, in);
return -EINVAL;
}
- toread = header.content_size / CHAR_BIT;
+ toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
for (;;) {
- readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
+ readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in);
if (ferror(in)) {
ret = -EINVAL;
break;
}
if (babeltrace_debug) {
+ buf[readlen] = '\0';
fprintf(stdout, "[debug] metadata packet read: %s\n",
buf);
}
if (ret < 0)
return ret;
+ if (filestats.st_size < MAX_PACKET_HEADER_LEN / CHAR_BIT)
+ return -EINVAL;
+
for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
uint64_t stream_id = 0;
return -EINVAL;
}
file_stream->stream.stream_class = stream;
+ ret = create_stream_definitions(td, &file_stream->stream);
+ if (ret)
+ return ret;
}
first_packet = 0;
- ret = create_stream_definitions(td, &file_stream->stream);
- if (ret)
- return ret;
-
if (file_stream->stream.stream_packet_context) {
/* Read packet context */
ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);