Fix: relayd: handling of lttng_read errors >= 0

[lttng-tools.git] / src / common / index / index.c

diff --git a/src/common/index/index.c b/src/common/index/index.c
index b481badb1d6556e2f6f1807264d33e81e6be41b2..bacb051bee03347a204f798d0a12d9c718842f8f 100644 (file)
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -128,12 +128,16 @@ error:
 int lttng_index_file_write(const struct lttng_index_file *index_file,
                const struct ctf_packet_index *element)
 {
+       int fd;
+       size_t len;
        ssize_t ret;
-       int fd = index_file->fd;
-       size_t len = index_file->element_len;
 
+       assert(index_file);
        assert(element);
 
+       fd = index_file->fd;
+       len = index_file->element_len;
+
        if (fd < 0) {
                goto error;
        }
@@ -168,10 +172,14 @@ int lttng_index_file_read(const struct lttng_index_file *index_file,
        }
 
        ret = lttng_read(fd, element, len);
-       if (ret < len) {
+       if (ret < 0) {
                PERROR("read index file");
                goto error;
        }
+       if (ret < len) {
+               ERR("lttng_read expected %zu, returned %zd", len, ret);
+               goto error;
+       }
        return 0;
 
 error: