X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=5cf8097ce709892580c49957cf4751f9bc2e753b;hb=a52600470ad14e59cba2e17de3df3f3f336b1adb;hp=278956b85e32a253af7491c8528b85712e643119;hpb=a74d9cb2e7b76755f5c52652eb0879eacc2a564c;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 278956b8..5cf8097c 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -471,6 +471,15 @@ int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *str
 	 */
 	if (unlikely(pos->offset == EOF))
 		return EOF;
+
+	if (pos->content_size == 0) {
+		/* Stream is inactive for now (live reading). */
+		return EAGAIN;
+	}
+	/* Packet only contains headers */
+	if (pos->offset == pos->content_size)
+		return EAGAIN;
+
 	assert(pos->offset < pos->content_size);
 
 	/* Read event header */
@@ -1572,6 +1581,11 @@ begin:
 		return -EINVAL;
 	}
 
+	if (packet_index.content_size < pos->offset) {
+		fprintf(stderr, "[error] Invalid CTF stream: content size is smaller than packet headers.\n");
+		return -EINVAL;
+	}
+
 	if ((packet_index.packet_size >> LOG2_CHAR_BIT) == 0) {
 		fprintf(stderr, "[error] Invalid CTF stream: packet size needs to be at least one byte\n");
 		return -EINVAL;