From 18cb4fa277c97c3d52cc784bb94dc931b1d74f08 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 16 Mar 2009 08:44:49 +0100 Subject: output_all: check param!=NULL before accessing it When printing the error message, MPD dereferences the NULL pointer to print an error message if no audio_output section is present. --- src/output_all.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/output_all.c b/src/output_all.c index d5c388b3b..bf9202060 100644 --- a/src/output_all.c +++ b/src/output_all.c @@ -113,8 +113,13 @@ audio_output_all_init(void) /* only allow param to be NULL if there just one audioOutput */ assert(param || (num_audio_outputs == 1)); - if (!audio_output_init(output, param, &error)) - g_error("line %i: %s", param->line, error->message); + if (!audio_output_init(output, param, &error)) { + if (param != NULL) + g_error("line %i: %s", + param->line, error->message); + else + g_error("%s", error->message); + } /* require output names to be unique: */ for (j = 0; j < i; j++) { -- cgit v1.2.3