diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-06 14:32:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-15 18:54:34 +0200 |
| commit | 003fa5c3e3c3d1027a886fb93cf9304a2b43b378 (patch) | |
| tree | a6ae03c5bf6d2fbe0e4a3123348646110e9d2d35 | |
| parent | 166921c23eb43088ba5937e6061bcca0de231e12 (diff) | |
| download | ffmpeg-003fa5c3e3c3d1027a886fb93cf9304a2b43b378.tar.gz | |
avcodec/bmp_parser: Check fsize
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 43a4276c6964a2ec57e08c3c622bb94d35c0441f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bmp_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index d2a04ef69b..cd65f02a2e 100644 --- a/libavcodec/bmp_parser.c +++ b/libavcodec/bmp_parser.c @@ -53,7 +53,8 @@ restart: if (bpc->pc.frame_start_found == 0) { if ((state >> 48) == (('B' << 8) | 'M')) { 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) { // unsigned hsize = av_bswap32(state>>32); |