From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 16 Aug 2017 19:40:02 +0000 (-0400)
Subject: Fix sink.ctf.fs: NULL dereference in logging statement
X-Git-Tag: v2.0.0-pre4~131
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=2a48e5aeb946dcfcb0a6c6bbf429354cb0fd5b4e

Fix sink.ctf.fs: NULL dereference in logging statement

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index b49a32f6..76ea9ad5 100644
--- a/plugins/ctf/fs-src/data-stream-file.c
+++ b/plugins/ctf/fs-src/data-stream-file.c
@@ -63,10 +63,11 @@ int ds_file_munmap(struct ctf_fs_ds_file *ds_file)
 	}
 
 	if (bt_munmap(ds_file->mmap_addr, ds_file->mmap_len)) {
-		BT_LOGE("Cannot memory-unmap address %p (size %zu) of file \"%s\" (%p): %s",
+		BT_LOGE_ERRNO("Cannot memory-unmap file",
+			": address=%p, size=%zu, file_path=\"%s\", file=%p",
 			ds_file->mmap_addr, ds_file->mmap_len,
-			ds_file->file->path->str, ds_file->file->fp,
-			strerror(errno));
+			ds_file->file->path->str,
+			ds_file->file ? ds_file->file->fp : NULL);
 		ret = -1;
 		goto end;
 	}