[FFmpeg-devel] [PATCH] lavc/movtextdec.c: Avoid infinite loop on invalid data.

[Philip Langdale]

On Tue, 27 Sep 2016 19:23:20 -0700
Sasi Inguva <isasi-at-google.com at ffmpeg.org> wrote:

> Signed-off-by: Sasi Inguva <isasi at google.com>
> ---
>  libavcodec/movtextdec.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
> index abf8711..a33fff7 100644
> --- a/libavcodec/movtextdec.c
> +++ b/libavcodec/movtextdec.c
> @@ -471,6 +471,10 @@ static int mov_text_decode_frame(AVCodecContext
> *avctx, tsmb_type = AV_RB32(tsmb);
>              tsmb += 4;
>  
> +            if (tsmb_size == 0) {
> +              return AVERROR_INVALIDDATA;
> +            }
> +
>              if (tsmb_size == 1) {
>                  if (m->tracksize + 16 > avpkt->size)
>                      break;

Pushed. Thanks.

--phil