X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=c4edcd32553104718c39d8c72fa05e8430450a8e;hp=30da41a140fca4ee278dc5cfdd63f7d6f1c8b675;hb=640a46fd3c8ebe3c14eb73f47ae6bbe22b19556f;hpb=eaecdbb27a8613291f9d366ef68e52d9f020e488

diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 30da41a1..c4edcd32 100644
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -143,9 +143,7 @@ enum ctf_msg_iter_medium_status medop_request_bytes(
 	bt_self_component *self_comp = ds_file->self_comp;
 	bt_logging_level log_level = ds_file->log_level;
 
-	if (request_sz == 0) {
-		goto end;
-	}
+	BT_ASSERT(request_sz > 0);
 
 	/*
 	 * Check if we have at least one memory-mapped byte left. If we don't,
@@ -174,9 +172,12 @@ enum ctf_msg_iter_medium_status medop_request_bytes(
 		}
 	}
 
+	BT_ASSERT(remaining_mmap_bytes(ds_file) > 0);
 	*buffer_sz = MIN(remaining_mmap_bytes(ds_file), request_sz);
+
 	BT_ASSERT(ds_file->mmap_addr);
 	*buffer_addr = ((uint8_t *) ds_file->mmap_addr) + ds_file->request_offset_in_mapping;
+
 	ds_file->request_offset_in_mapping += *buffer_sz;
 	goto end;