X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=01572dc94dc2aa873d58ece215734a0ffcb8485c;hp=d2f6799e11a070031805f09774e33b137c33d38c;hb=6a556f7b1ed1560da4e4e190ef6989670ddb8938;hpb=137b99423df05ce6eb6982ba0a4f0d7b58d48513

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index d2f6799e1..01572dc94 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -710,7 +710,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 		}
 		if (err < 0) {
 			PERROR("asprintf");
-			goto end;
+			goto error;
 		}
 	}
 
@@ -724,23 +724,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;
 }
 
 /*