From cfedea034e0a305d13e65d0d8068e21cb1af3d44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 16 May 2016 22:39:59 -0400 Subject: [PATCH] Simplify free() of channel attribute MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index b72b09198..d443d7926 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -1810,7 +1810,7 @@ static int _cmd_enable_event(struct ltt_session *session, int wpipe, bool internal_event) { int ret, channel_created = 0; - struct lttng_channel *attr; + struct lttng_channel *attr = NULL; assert(session); assert(event); @@ -1856,17 +1856,13 @@ static int _cmd_enable_event(struct ltt_session *session, if (lttng_strncpy(attr->name, channel_name, sizeof(attr->name))) { ret = LTTNG_ERR_INVALID; - free(attr); goto error; } ret = cmd_enable_channel(session, domain, attr, wpipe); if (ret != LTTNG_OK) { - free(attr); goto error; } - free(attr); - channel_created = 1; } @@ -1998,16 +1994,13 @@ static int _cmd_enable_event(struct ltt_session *session, if (lttng_strncpy(attr->name, channel_name, sizeof(attr->name))) { ret = LTTNG_ERR_INVALID; - free(attr); goto error; } ret = cmd_enable_channel(session, domain, attr, wpipe); if (ret != LTTNG_OK) { - free(attr); goto error; } - free(attr); /* Get the newly created channel reference back */ uchan = trace_ust_find_channel_by_name( @@ -2182,6 +2175,7 @@ error: free(filter_expression); free(filter); free(exclusion); + free(attr); rcu_read_unlock(); return ret; } -- 2.34.1