highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case

Browse Source 
Fixes Ticket 5438

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e26bdd59b)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-04-14 15:10:31 +02:00
parent 325d0b64d5
commit 14fdebc4ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bmp_parser.c
View File

@ -63,7 +63,7 @@ restart:
continue; continue;
} }
bpc->pc.frame_start_found++; bpc->pc.frame_start_found++;
bpc->remaining_size = bpc->fsize + i - 17; bpc->remaining_size = bpc->fsize + FFMAX(i - 17, 0);
if (bpc->pc.index + i > 17) { if (bpc->pc.index + i > 17) {
next = i - 17; next = i - 17;