[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] audio: prevent SIGSEGV in AUD_get_buffer_size_out
From: |
Volker Rümelin |
Subject: |
[PATCH 4/9] audio: prevent SIGSEGV in AUD_get_buffer_size_out |
Date: |
Thu, 23 Jan 2020 08:49:38 +0100 |
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 <address@hidden>
---
audio/audio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index bf0f01e17f..922e95011c 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -878,9 +878,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)
--
2.16.4
- [PATCH 0/9] more audio fixes and improvements, Volker Rümelin, 2020/01/23
- [PATCH 1/9] audio: fix audio_generic_write, Volker Rümelin, 2020/01/23
- [PATCH 2/9] audio: fix audio_generic_read, Volker Rümelin, 2020/01/23
- [PATCH 3/9] paaudio: remove unused variables, Volker Rümelin, 2020/01/23
- [PATCH 5/9] audio: fix bug 1858488, Volker Rümelin, 2020/01/23
- [PATCH 4/9] audio: prevent SIGSEGV in AUD_get_buffer_size_out,
Volker Rümelin <=
- [PATCH 7/9] ossaudio: prevent SIGPFE in oss_write, Volker Rümelin, 2020/01/23
- [PATCH 6/9] ossaudio: prevent SIGSEGV in oss_enable_out, Volker Rümelin, 2020/01/23
- [PATCH 8/9] ossaudio: disable poll mode can't be reached, Volker Rümelin, 2020/01/23
- [PATCH 9/9] audio: audio_generic_get_buffer_in should honor *size, Volker Rümelin, 2020/01/23
- Re: [PATCH 0/9] more audio fixes and improvements, Mark Cave-Ayland, 2020/01/27