On Tue, Feb 04, 2014 at 11:31:34AM +0100, Anton Khirnov wrote:
> Fixes invalid reads.
> 
> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
> CC:[email protected]
> ---
>  libavcodec/eacmv.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
> index 1a4e16e..1921c85 100644
> --- a/libavcodec/eacmv.c
> +++ b/libavcodec/eacmv.c
> @@ -141,6 +141,13 @@ static int cmv_process_header(CmvContext *s, const 
> uint8_t *buf, const uint8_t *
>      s->width  = AV_RL16(&buf[4]);
>      s->height = AV_RL16(&buf[6]);
>  
> +    if (s->width  != s->avctx->width ||
> +        s->height != s->avctx->height) {
> +        av_frame_unref(s->last_frame);
> +        av_frame_unref(s->last2_frame);
> +
> +    }
> +
>      ret = ff_set_dimensions(s->avctx, s->width, s->height);
>      if (ret < 0)
>          return ret;
> -- 

stray empty line, otherwise LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to