commit 69ac07863205ec281bcd2f2e6571202da0c315f7
author Volker Rümelin <vr_qemu@t-online.de> Thu Jan 23 08:49:38 2020 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Fri Jan 31 08:48:03 2020 +0100
tree 9dc45f16d9187eca497534a1baaaab89923f9fe8
parent a76e6b8794727ae777e33856e1ccd2b410d0bde2

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 <vr_qemu@t-online.de>
Message-Id: <20200123074943.6699-4-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

audio/audio.c

diff --git a/audio/audio.c b/audio/audio.c
index 9cd76a3..12ed318 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -879,9 +879,9 @@
     }
 }
 
-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)