virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-13 16:43:27 +02:00
parent d86cf4a91d
commit b11d1889ef
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/bmp_parser.c
View File

@ -45,21 +45,32 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx,
int i = 0; int i = 0;
*poutbuf_size = 0; *poutbuf_size = 0;
if (buf_size == 0)
return 0;
if (!bpc->pc.frame_start_found) { if (bpc->pc.frame_start_found <= 2+4+4) {
for (; i < buf_size; i++) { for (; i < buf_size; i++) {
state = (state << 8) | buf[i]; state = (state << 8) | buf[i];
if ((state >> 48) == (('B' << 8) | 'M')) { if (bpc->pc.frame_start_found == 0) {
bpc->fsize = av_bswap32(state >> 16); if ((state >> 48) == (('B' << 8) | 'M')) {
bpc->pc.frame_start_found = 1; bpc->fsize = av_bswap32(state >> 16);
if (bpc->fsize > buf_size - i + 7) bpc->pc.frame_start_found = 1;
bpc->remaining_size = bpc->fsize - buf_size + i - 7; }
} else if (bpc->pc.frame_start_found == 2+4+4) {
// unsigned hsize = av_bswap32(state>>32);
unsigned ihsize = av_bswap32(state);
if (ihsize < 12 || ihsize > 200) {
bpc->pc.frame_start_found = 0;
continue;
}
if (bpc->fsize <= ihsize + 14)
bpc->fsize = INT_MAX/2;
bpc->pc.frame_start_found++;
if (bpc->fsize > buf_size - i + 17)
bpc->remaining_size = bpc->fsize - buf_size + i - 17;
else else
next = bpc->fsize + i - 7; next = bpc->fsize + i - 17;
break; break;
} } else if (bpc->pc.frame_start_found)
bpc->pc.frame_start_found++;
} }
bpc->pc.state64 = state; bpc->pc.state64 = state;
} else { } else {