virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes Ticket #2087.
This commit is contained in:
Clément Bœsch 2013-01-01 16:41:37 +01:00
parent 1dd4a21cb7
commit 7d66bc7920
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/movtextdec.c
View File

@ -83,7 +83,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
* In complex cases, there are style descriptors appended to the string * In complex cases, there are style descriptors appended to the string
* so we can't just assume the packet size is the string size. * 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; ptr += 2;
ts_start = av_rescale_q(avpkt->pts, ts_start = av_rescale_q(avpkt->pts,