X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=e499ef3d37894eb3aababec3d4ad59c18abbd964;hp=ce65024f5f6b912cbf2406d8be8e82018c2b9e90;hb=441c16a7f0bbab56a5e783059d0cddab68544a9a;hpb=5eb00805632a8721bd15247847caa053e9858719

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index ce65024f5..e499ef3d3 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -369,6 +369,9 @@ static int add_context(char *session_name)
 	struct ctx_type *type;
 	char *ptr;
 
+	memset(&context, 0, sizeof(context));
+	memset(&dom, 0, sizeof(dom));
+
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	} else if (opt_userspace) {
@@ -466,7 +469,6 @@ int cmd_add_context(int argc, const char **argv)
 		switch (opt) {
 		case OPT_HELP:
 			usage(stdout);
-			ret = CMD_SUCCESS;
 			goto end;
 		case OPT_TYPE:
 			/*
@@ -505,7 +507,6 @@ int cmd_add_context(int argc, const char **argv)
 			break;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -514,6 +515,13 @@ int cmd_add_context(int argc, const char **argv)
 		}
 	}
 
+	if (!opt_type) {
+		ERR("Missing mandatory -t TYPE");
+		usage(stderr);
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	if (!opt_session_name) {
 		session_name = get_session_name();
 		if (session_name == NULL) {
@@ -532,5 +540,6 @@ end:
 		free(type);
 	}
 
+	poptFreeContext(pc);
 	return ret;
 }