aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-06 14:32:48 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit603fd4f771433bdddce2836dffca78c724d76dea (patch)
tree10e823bdd14cc518b39a2b954d5f86a57ee0b4f4
parent76a239768f630b4766fd3be71f7d465eeeda1d79 (diff)
downloadandroid_external_ffmpeg-603fd4f771433bdddce2836dffca78c724d76dea.tar.gz
android_external_ffmpeg-603fd4f771433bdddce2836dffca78c724d76dea.tar.bz2
android_external_ffmpeg-603fd4f771433bdddce2836dffca78c724d76dea.zip
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.c3
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);