From 3d7e6f1961bbf4fc40ac9d11fd75cf9dbf53f2b2 Mon Sep 17 00:00:00 2001 From: Alex Iadicicco Date: Mon, 14 Oct 2013 16:33:33 -0700 Subject: [PATCH] os_trace: Actually fix the issue with floods of failed assertions --- os_trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/os_trace.c b/os_trace.c index efb720a..d8f1c9b 100644 --- a/os_trace.c +++ b/os_trace.c @@ -293,9 +293,11 @@ static bool trace_channel_exec(user_t *u, void *q) trace_query_channel_domain_t *domain = (trace_query_channel_domain_t *) q; return_val_if_fail(domain != NULL, false); - return_val_if_fail(domain->channel != NULL, false); return_val_if_fail(u != NULL, false); + if (domain->channel == NULL) + return false; + return (chanuser_find(domain->channel, u) != NULL); }