From 625fb922bfab3de3c199ad59b690dd50083f8585 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Fri, 2 Nov 2018 19:02:33 +0200 Subject: some hardening --- src/pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pcm.c b/src/pcm.c index d1e3734..3a28b37 100644 --- a/src/pcm.c +++ b/src/pcm.c @@ -369,7 +369,8 @@ io_do(snd_pcm_t *pcm, const void *buffer, const size_t frames, size_t (*io)(stru const size_t enc_frames = sizeof(encoded) / (params[1].bps * chans); const size_t max_frames = MIN(dec_frames, enc_frames); for (const unsigned char *p = buffer; total_frames > 0;) { - const int todo_frames = (total_frames > max_frames ? max_frames : total_frames); + const int todo_frames = MIN(max_frames, total_frames); + assert(todo_frames <= total_frames); total_frames -= todo_frames; // sadly can't function pointer here as some formats may need different parameters for decoder -- cgit v1.2.3