From 297941e39c831c8a469b0d39ac7c06897a8d01dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 21 Jun 2017 17:54:24 -0400 Subject: [PATCH] Fix: ctf_fs_metadata is assumed to be non-null MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- plugins/ctf/fs-src/metadata.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c index 18ecb0c5..383944c4 100644 --- a/plugins/ctf/fs-src/metadata.c +++ b/plugins/ctf/fs-src/metadata.c @@ -103,8 +103,8 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace, struct ctf_fs_file *file = NULL; struct ctf_metadata_decoder *metadata_decoder = NULL; struct ctf_metadata_decoder_config decoder_config = { - .clock_class_offset_s = config->clock_class_offset_s, - .clock_class_offset_ns = config->clock_class_offset_ns, + .clock_class_offset_s = config ? config->clock_class_offset_s : 0, + .clock_class_offset_ns = config ? config->clock_class_offset_ns : 0, }; file = get_file(ctf_fs_trace->path->str); @@ -114,7 +114,8 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace, goto end; } - metadata_decoder = ctf_metadata_decoder_create(&decoder_config, + metadata_decoder = ctf_metadata_decoder_create( + config ? &decoder_config : NULL, ctf_fs_trace->name->str); if (!metadata_decoder) { BT_LOGE("Cannot create metadata decoder object"); -- 2.34.1