Commit 3e0c1bba authored by Volker Rümelin's avatar Volker Rümelin Committed by Gerd Hoffmann
Browse files

ossaudio: prevent SIGSEGV in oss_enable_out 



With audiodev parameter out.mixing-engine=off hw->mix_buf is
NULL. This patch reverts a small part of dc88e38f "audio:
unify input and output mixeng buffer management".

To reproduce the problem start qemu with
-audiodev oss,id=audio0,try-mmap=on,out.mixing-engine=off

Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
Message-Id: <20200123074943.6699-6-vr_qemu@t-online.de>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent fdc8c5f4

audio/ossaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static void oss_enable_out(HWVoiceOut *hw, bool enable) 
            return;

        }



        audio_pcm_info_clear_buf(&hw->info, hw->buf_emul, hw->mix_buf->size);

        audio_pcm_info_clear_buf(&hw->info, hw->buf_emul, hw->samples);

        trig = PCM_ENABLE_OUTPUT;

        if (ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) {

            oss_logerr(errno,