Fix sink.ctf.fs: NULL dereference in logging statement
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 16 Aug 2017 19:40:02 +0000 (15:40 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 16 Aug 2017 19:43:52 +0000 (15:43 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
plugins/ctf/fs-src/data-stream-file.c

index b49a32f683e93bce72ba7c2072153a363553aa3f..76ea9ad502939758176908b41e15c09a54650901 100644 (file)
@@ -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;
        }
This page took 0.024766 seconds and 4 git commands to generate.