From 6eee9f5596074f9c0ff2cb25050b56c2914ff411 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 31 Jul 2012 23:45:16 +0200 Subject: [PATCH] 8svx: ensure that packet size is multiple of channels. Fix an assert failure with packets of invalid size. --- libavcodec/8svx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index e89b252218..8d6a6d692e 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -112,9 +112,16 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, /* decode and interleave the first packet */ if (!esc->samples && avpkt) { uint8_t *deinterleaved_samples, *p = NULL; + int packet_size = avpkt->size; + if (packet_size % avctx->channels) { + av_log(avctx, AV_LOG_WARNING, "Packet with odd size, ignoring last byte\n"); + if (packet_size < avctx->channels) + return packet_size; + packet_size -= packet_size % avctx->channels; + } esc->samples_size = !esc->table ? - avpkt->size : avctx->channels + (avpkt->size-avctx->channels) * 2; + packet_size : avctx->channels + (packet_size-avctx->channels) * 2; if (!(esc->samples = av_malloc(esc->samples_size))) return AVERROR(ENOMEM);