From 49c360e815ad63e137ba9664f786c91df76d27b3 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 3 Oct 2016 14:57:31 -0400 Subject: [PATCH] Fix: test presence of override_attr before accessing its member MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/lib/lttng-ctl/load.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lib/lttng-ctl/load.c b/src/lib/lttng-ctl/load.c index b396b7500..f89effed0 100644 --- a/src/lib/lttng-ctl/load.c +++ b/src/lib/lttng-ctl/load.c @@ -94,10 +94,12 @@ const char *lttng_load_session_attr_get_override_ctrl_url( { const char *ret = NULL; - if (attr && attr->override_attr->ctrl_url) { - ret = attr->raw_override_ctrl_url; + if (!attr || !attr->override_attr) { + goto end; } + ret = attr->raw_override_ctrl_url; +end: return ret; } @@ -106,10 +108,12 @@ const char *lttng_load_session_attr_get_override_data_url( { const char *ret = NULL; - if (attr && attr->override_attr->data_url) { - ret = attr->raw_override_data_url; + if (!attr || !attr->override_attr) { + goto end; } + ret = attr->raw_override_data_url; +end: return ret; } @@ -118,12 +122,16 @@ const char *lttng_load_session_attr_get_override_url( { const char *ret = NULL; - if (attr && (attr->override_attr->path_url || + if (!attr || !attr->override_attr) { + goto end; + } + + if ((attr->override_attr->path_url || (attr->override_attr->ctrl_url && attr->override_attr->data_url))) { ret = attr->raw_override_url; } - +end: return ret; } -- 2.34.1