Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 83da8fbfa3cdcd16bef7276af6aec0eea4a4566b:

  Allow verify w/norandommap and bsrange (2015-02-18 10:38:37 -0800)

are available in the git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to bb1116fe9a53154447bb4305ed9d9fd42d2a6aa1:

  Fixup whitespace damage in the two previous commits (2015-02-19 08:47:34 -0800)

----------------------------------------------------------------
Erwan Velu (2):
      iolog: Don't leak memory if fread fails in iolog_file_inflate
      axmap: Avoid memory leak if axmap_new() failed

Jens Axboe (1):
      Fixup whitespace damage in the two previous commits

 iolog.c     |    2 ++
 lib/axmap.c |    1 +
 2 files changed, 3 insertions(+)

---

Diff of recent changes:

diff --git a/iolog.c b/iolog.c
index b867583..dfa329f 100644
--- a/iolog.c
+++ b/iolog.c
@@ -876,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;
 	}
 
diff --git a/lib/axmap.c b/lib/axmap.c
index 164300f..9153df5 100644
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -125,6 +125,7 @@ err:
 			free(axmap->levels[i].map);
 
 	free(axmap->levels);
+	free(axmap);
 	return NULL;
 }