log: check if log_charset is set

When logging to a file, log_charset would be NULL and g_convert() would abort.

log: check if log_charset is set
5b2e9812 · Max Kellermann · fce8fa0b · 5b2e9812
Commit 5b2e9812 authored Nov 05, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

log.c src/log.c +8 -5

No files found.
--- a/src/log.c
+++ b/src/log.c
@@ -75,11 +75,14 @@ mpd_log_func(G_GNUC_UNUSED const gchar *log_domain,
 		? stderr : stdout;
 	char *converted;
-	converted = g_convert_with_fallback(message, -1,
+	if (log_charset != NULL) {
-					    log_charset, "utf-8",
+		converted = g_convert_with_fallback(message, -1,
-					    NULL, NULL, NULL, NULL);
+						    log_charset, "utf-8",
-	if (converted != NULL)
+						    NULL, NULL, NULL, NULL);
-		message = converted;
+		if (converted != NULL)
+			message = converted;
+	} else
+		converted = NULL;
 	fprintf(file, "%s%s",
 		stdout_mode ? "" : log_date(),