From 2026c41be6f4e1a526c94c1368e5e528597df03a Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Mon, 25 Mar 2013 09:20:14 +0100 Subject: [PATCH] protocol-native: Ensure tlength is not set higher than maxlength Tlength should never be set higher than maxlength. While this is corrected by memblockq later, we still need a correct tlength for the subsequent calculations. Signed-off-by: David Henningsson --- src/pulsecore/protocol-native.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 7095519d4..e8aa13cdd 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -936,6 +936,8 @@ static void fix_playback_buffer_attr(playback_stream *s) { s->buffer_attr.tlength = (uint32_t) pa_usec_to_bytes_round_up(DEFAULT_TLENGTH_MSEC*PA_USEC_PER_MSEC, &s->sink_input->sample_spec); if (s->buffer_attr.tlength <= 0) s->buffer_attr.tlength = (uint32_t) frame_size; + if (s->buffer_attr.tlength > s->buffer_attr.maxlength) + s->buffer_attr.tlength = s->buffer_attr.maxlength; if (s->buffer_attr.minreq == (uint32_t) -1) s->buffer_attr.minreq = (uint32_t) pa_usec_to_bytes_round_up(DEFAULT_PROCESS_MSEC*PA_USEC_PER_MSEC, &s->sink_input->sample_spec);