[FFmpeg-devel] [PATCH] 8svx: ensure that packet size is multiple of channels.

[Michael Niedermayer]

On Wed, Aug 01, 2012 at 12:49:18AM +0200, Nicolas George wrote:
> Fix an assert failure with packets of invalid size.
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavcodec/8svx.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
> index e89b252..8d6a6d6 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);

LGTM

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120801/85310f64/attachment.asc>