lavc/movtextdec: keep the min size instead of max to fix overread.

Fixes Ticket #2087.
12 years ago · 7d66bc7920
parent 1dd4a21cb7
commit 7d66bc7920
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@ -83,7 +83,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
     * In complex cases, there are style descriptors appended to the string
     * so we can't just assume the packet size is the string size.
     */
-    end = ptr + FFMAX(2 + AV_RB16(ptr), avpkt->size);
+    end = ptr + FFMIN(2 + AV_RB16(ptr), avpkt->size);
    ptr += 2;

    ts_start = av_rescale_q(avpkt->pts,