From 3defb8eae008c8077866f12863eb2c920d0922a7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 29 Jan 2009 18:11:30 +0100 Subject: jack: allocate ring buffers before connecting If the ring buffers are allocated after jack_activate(), mpd_jack_process() might segfault because it attempts to access them. --- src/output/jack_plugin.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c index b66dd4a1f..0bc760b01 100644 --- a/src/output/jack_plugin.c +++ b/src/output/jack_plugin.c @@ -262,6 +262,9 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format) jd->audio_format = audio_format; + jd->ringbuffer[0] = jack_ringbuffer_create(jd->ringbuffer_size); + jd->ringbuffer[1] = jack_ringbuffer_create(jd->ringbuffer_size); + if ((jd->client = jack_client_new(mpd_jack_name(jd))) == NULL) { ERROR("jack server not running?\n"); return -1; @@ -308,11 +311,6 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format) if ( jd->output_ports[1] ) { const char *name = mpd_jack_name(jd); - jd->ringbuffer[0] = jack_ringbuffer_create(jd->ringbuffer_size); - jd->ringbuffer[1] = jack_ringbuffer_create(jd->ringbuffer_size); - memset(jd->ringbuffer[0]->buf, 0, jd->ringbuffer[0]->size); - memset(jd->ringbuffer[1]->buf, 0, jd->ringbuffer[1]->size); - port_name = xmalloc(sizeof(char) * (7 + strlen(name))); sprintf(port_name, "%s:left", name); -- cgit v1.2.3