X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=4aeeff24e86d805fff5a40c679b80fa798da56f6;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hp=ed4f87fb4e84fd11c4518fa866194d8611da6903;hpb=ae8564917fa3cb3497ec17951d8ac0ee28de9c81;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index ed4f87fb4..4aeeff24e 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -309,6 +309,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "will be added to all events and all channels.\n");
 	fprintf(ofp, "Otherwise the context will be added only to the channel (-c)\n");
 	fprintf(ofp, "and/or event (-e) indicated.\n");
+	fprintf(ofp, "Exactly one domain (-k/--kernel or -u/--userspace) must be specified.\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
@@ -369,6 +370,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) {
@@ -531,6 +535,10 @@ int cmd_add_context(int argc, const char **argv)
 
 	ret = add_context(session_name);
 
+	if (!opt_session_name) {
+		free(session_name);
+	}
+
 end:
 	/* Cleanup allocated memory */
 	cds_list_for_each_entry_safe(type, tmptype, &ctx_type_list.head, list) {