From: Volker Rümelin Date: Thu, 23 Jan 2020 07:49:38 +0000 (+0100) Subject: audio: prevent SIGSEGV in AUD_get_buffer_size_out X-Git-Tag: v5.0.0-rc0~104^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69ac07863205ec281bcd2f2e6571202da0c315f7;p=thirdparty%2Fqemu.git audio: prevent SIGSEGV in AUD_get_buffer_size_out With audiodev parameter out.mixing-engine=off hw->mix_buf is NULL. This leads to a segmentation fault in AUD_get_buffer_size_out. This patch reverts a small part of dc88e38fa7 "audio: unify input and output mixeng buffer management". To reproduce the problem start qemu with -soundhw adlib -audiodev pa,id=audio0,out.mixing-engine=off Signed-off-by: Volker Rümelin Message-Id: <20200123074943.6699-4-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- diff --git a/audio/audio.c b/audio/audio.c index 9cd76a331d7..12ed318813f 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -879,9 +879,9 @@ size_t AUD_read(SWVoiceIn *sw, void *buf, size_t size) } } -int AUD_get_buffer_size_out (SWVoiceOut *sw) +int AUD_get_buffer_size_out(SWVoiceOut *sw) { - return sw->hw->mix_buf->size * sw->hw->info.bytes_per_frame; + return sw->hw->samples * sw->hw->info.bytes_per_frame; } void AUD_set_active_out (SWVoiceOut *sw, int on)