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

avcodec/bmp_parser: Check fsize

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 43a4276c6964a2ec57e08c3c622bb94d35c0441f)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-06-06 14:32:48 +02:00
parent 166921c23e
commit 003fa5c3e3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/bmp_parser.c
View File

@ -53,7 +53,8 @@ restart:
if (bpc->pc.frame_start_found == 0) { if (bpc->pc.frame_start_found == 0) {
if ((state >> 48) == (('B' << 8) | 'M')) { if ((state >> 48) == (('B' << 8) | 'M')) {
bpc->fsize = av_bswap32(state >> 16); bpc->fsize = av_bswap32(state >> 16);
bpc->pc.frame_start_found = 1; if (bpc->fsize > 17)
bpc->pc.frame_start_found = 1;
} }
} else if (bpc->pc.frame_start_found == 2+4+4) { } else if (bpc->pc.frame_start_found == 2+4+4) {
// unsigned hsize = av_bswap32(state>>32); // unsigned hsize = av_bswap32(state>>32);