From d1b4112f45be3db6158027b225939dffbe84554c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 13 Jun 2008 07:39:11 +0000 Subject: jack: initialize audioOutput->data Initialize audioOutput->data with NULL in jack_initDriver(). Previously, this was never initialized, although the other functions relied on it being NULL prior to jack_openDevice(). This patch addresses bug 0001641[1]. In contrast to the patch provided by the bug reporter, it moves the initialization before the "!param" check. [1] - http://musicpd.org/mantis/view.php?id=1641 git-svn-id: https://svn.musicpd.org/mpd/trunk@7375 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/audioOutputs/audioOutput_jack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c index 629702f2..ed0bceb4 100644 --- a/src/audioOutputs/audioOutput_jack.c +++ b/src/audioOutputs/audioOutput_jack.c @@ -191,7 +191,9 @@ static int jack_initDriver(AudioOutput *audioOutput, ConfigParam *param) BlockParam *bp; char *endptr; int val; - char *cp = NULL; + char *cp = NULL; + + audioOutput->data = NULL; DEBUG("jack_initDriver (pid=%d)\n", getpid()); if ( ! param ) return 0; -- cgit v1.2.3