From acffd1e792452ff31fa48cda960555c01d9c9315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 26 Oct 2012 18:52:07 +0200 Subject: [PATCH] main: Guard against NULL log_domain in default handler g_str_has_prefix() will assert when passed NULL, so we need to make sure that we are passed a non-NULL log_domain first. Spotted by yahoo.com.cn> https://bugzilla.gnome.org/show_bug.cgi?id=663601 --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 8e805a627..ca2116a96 100644 --- a/src/main.c +++ b/src/main.c @@ -284,7 +284,7 @@ default_log_handler (const char *log_domain, /* Filter out telepathy-glib logs, we don't want to flood Shell's output * with those. */ - if (!g_str_has_prefix (log_domain, "tp-glib")) + if (!log_domain || !g_str_has_prefix (log_domain, "tp-glib")) g_log_default_handler (log_domain, log_level, message, data); }