aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-06-13 07:39:11 +0000
committerEric Wong <normalperson@yhbt.net>2008-06-13 07:39:11 +0000
commitd1b4112f45be3db6158027b225939dffbe84554c (patch)
treed4a1c7232beab28889ea7984f7a3fc2ac84b22cc /src/audioOutputs
parent4f247ca4da866f4e957dada17a2fa5f632fa9f25 (diff)
downloadmpd-d1b4112f45be3db6158027b225939dffbe84554c.tar.gz
mpd-d1b4112f45be3db6158027b225939dffbe84554c.tar.xz
mpd-d1b4112f45be3db6158027b225939dffbe84554c.zip
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
Diffstat (limited to 'src/audioOutputs')
-rw-r--r--src/audioOutputs/audioOutput_jack.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c
index 629702f20..ed0bceb46 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;