From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 27 Jul 2023 16:26:42 +0000 (-0400)
Subject: Fix: lttng-add-context: context type options possible null dereference
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ca400a290;p=lttng-tools.git

Fix: lttng-add-context: context type options possible null dereference

Coverity reports that:
** CID 1518091:  Null pointer dereferences  (FORWARD_NULL)
/src/bin/lttng/commands/add_context.cpp: 820 in destroy_ctx_type(<unnamed>::ctx_type *)(

Free application context options only if type->opt isn't null.

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

diff --git a/src/bin/lttng/commands/add_context.cpp b/src/bin/lttng/commands/add_context.cpp
index 550015f17..3a0613bd0 100644
--- a/src/bin/lttng/commands/add_context.cpp
+++ b/src/bin/lttng/commands/add_context.cpp
@@ -815,11 +815,11 @@ static void destroy_ctx_type(struct ctx_type *type)
 
 	if (type->opt) {
 		free(type->opt->symbol);
-	}
 
-	if (type->opt->ctx_type == CONTEXT_APP_CONTEXT) {
-		free(type->opt->u.app_ctx.ctx_name);
-		free(type->opt->u.app_ctx.provider_name);
+		if (type->opt->ctx_type == CONTEXT_APP_CONTEXT) {
+			free(type->opt->u.app_ctx.ctx_name);
+			free(type->opt->u.app_ctx.provider_name);
+		}
 	}
 
 	delete type->opt;