[FFmpeg-devel] [PATCH 4/7] Ensure that the video dimension are a multiple of 16 in the 4xm decoder.

[Michael Niedermayer]

On Sun, Oct 02, 2011 at 03:51:35PM +0200, Laurent Aimar wrote:
> On Sun, Oct 02, 2011 at 03:03:39AM +0200, Michael Niedermayer wrote:
> > On Sun, Oct 02, 2011 at 12:38:29AM +0200, fenrir at elivagar.org wrote:
> > > From: Laurent Aimar <fenrir at videolan.org>
> > > 
> > > ---
> > >  libavcodec/4xm.c |    2 ++
> > >  1 files changed, 2 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
> > > index 6335879..6ee9b34 100644
> > > --- a/libavcodec/4xm.c
> > > +++ b/libavcodec/4xm.c
> > > @@ -866,6 +866,8 @@ static av_cold int decode_init(AVCodecContext *avctx){
> > >          return 1;
> > >      }
> > >  
> > > +    avctx->width  = FFALIGN(avctx->width, 16);
> > > +    avctx->height = FFALIGN(avctx->height, 16);
> > >      avcodec_get_frame_defaults(&f->current_picture);
> > 
> > This doesnt look correct.
> > If width/height must be a multiple of 16 then the decoder should fail
> > if its not so. Otherwise it should support it and not return a bigger
> > picture
>  Ok, new patch attached.
> 
> -- 
> fenrir

>  4xm.c |    4 ++++
>  1 file changed, 4 insertions(+)
> be4d0aac404997b833ac92b8a08e5e812fe6be22  0001-Reject-video-with-non-multiple-of-16-width-height-in.patch
> From b59bd5234a26ae9a2dcd218ade9243dc10f32fe1 Mon Sep 17 00:00:00 2001
> From: Laurent Aimar <fenrir at videolan.org>
> Date: Sat, 1 Oct 2011 02:04:45 +0200
> Subject: [PATCH 1/3] Reject video with non multiple of 16 width/height in the 4xm decoder.

applied, thanks

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

I hate to see young programmers poisoned by the kind of thinking
Ulrich Drepper puts forward since it is simply too narrow -- Roman Shaposhnik
-------------- 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/20111002/a2871d53/attachment.asc>