X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=ae9cede2588d0ba97218d43dc55b55e5fdeab139;hb=272ffc407fc5050e2967c33d70a137b6bc1d7ce3;hp=a92bf39125b287528d202d9160e09d7b7c7462f2;hpb=6cf1eedbe1a661a55f6b87cc40c8bb3dfe2abb29;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index a92bf3912..ae9cede25 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -222,7 +222,7 @@ int lttng_check_tracing_group(void)
 	}
 
 	/* Alloc group list of the right size */
-	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	grp_list = zmalloc(grp_list_size * sizeof(gid_t));
 	if (!grp_list) {
 		perror("malloc");
 		goto end;
@@ -442,7 +442,11 @@ int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
 		goto end;
 	}
 
-	data = (void*) malloc(size);
+	data = zmalloc(size);
+	if (!data) {
+		ret = -ENOMEM;
+		goto end;
+	}
 
 	/* Get payload data */
 	ret = recv_data_sessiond(data, size);
@@ -482,7 +486,7 @@ struct lttng_handle *lttng_create_handle(const char *session_name,
 		goto end;
 	}
 
-	handle = malloc(sizeof(struct lttng_handle));
+	handle = zmalloc(sizeof(struct lttng_handle));
 	if (handle == NULL) {
 		PERROR("malloc handle");
 		goto end;
@@ -703,7 +707,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 	/* Don't add filter for the '*' event. */
 	if (ev->name[0] != '*') {
 		if (filter) {
-			err = asprintf(&jul_filter, "%s && logger_name == \"%s\"", filter,
+			err = asprintf(&jul_filter, "(%s) && (logger_name == \"%s\")", filter,
 					ev->name);
 		} else {
 			err = asprintf(&jul_filter, "logger_name == \"%s\"", ev->name);
@@ -727,7 +731,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 		if (filter || jul_filter) {
 			char *new_filter;
 
-			err = asprintf(&new_filter, "%s && int_loglevel %s %d",
+			err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
 					jul_filter ? jul_filter : filter, op,
 					ev->loglevel);
 			if (jul_filter) {
@@ -1056,7 +1060,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (name != NULL) {
+	if (name != NULL && *name != '*') {
 		lttng_ctl_copy_string(lsm.u.disable.name, name,
 				sizeof(lsm.u.disable.name));
 		lsm.cmd_type = LTTNG_DISABLE_EVENT;