X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=ac123cdbc20732eb96cdc0b9145ab5586608b14f;hb=9b1ddda7fd61aa88b29317cd30e4e2769534c21b;hp=be2e275f8369bb63a20e2124b8dc5ed0f24ffb06;hpb=7cb477a90d5aecc834a23ecaec8c2d56b1807573;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index be2e275f8..ac123cdbc 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -717,7 +717,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 		}
 		if (err < 0) {
 			PERROR("asprintf");
-			goto end;
+			goto error;
 		}
 	}
 
@@ -731,23 +731,30 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 			op = "==";
 		}
 
-		if (filter) {
-			err = asprintf(&jul_filter, "%s && int_loglevel %s %d", filter, op,
+		if (filter || jul_filter) {
+			char *new_filter;
+
+			err = asprintf(&new_filter, "%s && int_loglevel %s %d",
+					jul_filter ? jul_filter : filter, op,
 					ev->loglevel);
+			if (jul_filter) {
+				free(jul_filter);
+			}
+			jul_filter = new_filter;
 		} else {
 			err = asprintf(&jul_filter, "int_loglevel %s %d", op,
 					ev->loglevel);
 		}
 		if (err < 0) {
 			PERROR("asprintf");
-			free(jul_filter);
-			jul_filter = NULL;
-			goto end;
+			goto error;
 		}
 	}
 
-end:
 	return jul_filter;
+error:
+	free(jul_filter);
+	return NULL;
 }
 
 /*