From: Douglas Santos <douglas.santos@polymtl.ca>
Date: Fri, 10 Sep 2010 21:28:55 +0000 (+0200)
Subject: null check for disable_marker
X-Git-Tag: v0.8~19
X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=b17081c0591fd50dda4e8a17d71112e130a7b656

null check for disable_marker

Signed-off-by: Douglas Santos <douglas.santos@polymtl.ca>

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/libust/tracectl.c b/libust/tracectl.c
index f1b644c..dd61ebe 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -1064,7 +1064,9 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src)
 
 		result = sscanf(channel_slash_name, "%a[^/]/%as", &channel_name, &marker_name);
 
-		if(marker_name == NULL) {
+		if(channel_name == NULL || marker_name == NULL) {
+			WARN("invalid marker name");
+			goto next_cmd;
 		}
 
 		result = ltt_marker_disconnect(channel_name, marker_name, "default");