Fix segfault due to bad munmap()

[fio.git] / iolog.c

diff --git a/iolog.c b/iolog.c
index 99f8bc18d8694cca0c141c51d116aced1b4130f2..dfa329fc2e75d7fc0191ada7d227d113762ec434 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -250,6 +250,7 @@ restart:
        p = &td->io_hist_tree.rb_node;
        parent = NULL;
        while (*p) {
+               int overlap = 0;
                parent = *p;
 
                __ipo = rb_entry(parent, struct io_piece, rb_node);
@@ -257,11 +258,18 @@ restart:
                        p = &(*p)->rb_left;
                else if (ipo->file > __ipo->file)
                        p = &(*p)->rb_right;
-               else if (ipo->offset < __ipo->offset)
+               else if (ipo->offset < __ipo->offset) {
                        p = &(*p)->rb_left;
-               else if (ipo->offset > __ipo->offset)
+                       overlap = ipo->offset + ipo->len > __ipo->offset;
+               }
+               else if (ipo->offset > __ipo->offset) {
                        p = &(*p)->rb_right;
-               else {
+                       overlap = __ipo->offset + __ipo->len > ipo->offset;
+               }
+               else
+                       overlap = 1;
+
+               if (overlap) {
                        dprint(FD_IO, "iolog: overlap %llu/%lu, %llu/%lu",
                                __ipo->offset, __ipo->len,
                                ipo->offset, ipo->len);
@@ -868,10 +876,12 @@ int iolog_file_inflate(const char *file)
        if (ret < 0) {
                perror("fread");
                fclose(f);
+               free(buf);
                return 1;
        } else if (ret != 1) {
                log_err("fio: short read on reading log\n");
                fclose(f);
+               free(buf);
                return 1;
        }