[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/12] ossaudio: prevent SIGSEGV in oss_enable_out
From: |
Gerd Hoffmann |
Subject: |
[PULL 07/12] ossaudio: prevent SIGSEGV in oss_enable_out |
Date: |
Fri, 7 Feb 2020 08:45:52 +0100 |
From: Volker RĂ¼melin <address@hidden>
With audiodev parameter out.mixing-engine=off hw->mix_buf is
NULL. This patch reverts a small part of dc88e38fa7 "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: Volker RĂ¼melin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/ossaudio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 576b5b5b2021..39a6fc09e5df 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -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,
--
2.18.1
- [PULL 00/12] Audio 20200207 patches, Gerd Hoffmann, 2020/02/07
- [PULL 02/12] audio: fix audio_generic_write, Gerd Hoffmann, 2020/02/07
- [PULL 04/12] paaudio: remove unused variables, Gerd Hoffmann, 2020/02/07
- [PULL 01/12] audio/oss: fix buffer pos calculation, Gerd Hoffmann, 2020/02/07
- [PULL 05/12] audio: prevent SIGSEGV in AUD_get_buffer_size_out, Gerd Hoffmann, 2020/02/07
- [PULL 03/12] audio: fix audio_generic_read, Gerd Hoffmann, 2020/02/07
- [PULL 07/12] ossaudio: prevent SIGSEGV in oss_enable_out,
Gerd Hoffmann <=
- [PULL 08/12] ossaudio: disable poll mode can't be reached, Gerd Hoffmann, 2020/02/07
- [PULL 11/12] coreaudio: fix coreaudio playback, Gerd Hoffmann, 2020/02/07
- [PULL 09/12] audio: audio_generic_get_buffer_in should honor *size, Gerd Hoffmann, 2020/02/07
- [PULL 06/12] audio: fix bug 1858488, Gerd Hoffmann, 2020/02/07
- [PULL 12/12] audio: proper support for float samples in mixeng, Gerd Hoffmann, 2020/02/07
- [PULL 10/12] audio/dsound: fix invalid parameters error, Gerd Hoffmann, 2020/02/07
- Re: [PULL 00/12] Audio 20200207 patches, Peter Maydell, 2020/02/07