diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-14 15:10:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-01 05:00:45 +0200 |
| commit | 1e46629234aa19f3ad1e94d220cd90510ae58ca6 (patch) | |
| tree | 163836bbecdc8e720dd5c46fc3ed1e626f991e32 | |
| parent | dc751a55e5ae243630b18f3f6bedc49ee9656b38 (diff) | |
| download | ffmpeg-1e46629234aa19f3ad1e94d220cd90510ae58ca6.tar.gz | |
avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case
Fixes Ticket 5438
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e26bdd59bf559d00c7e60c53fff292de10139ff)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bmp_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index c9493dc32d..7ab32a0b00 100644 --- a/libavcodec/bmp_parser.c +++ b/libavcodec/bmp_parser.c @@ -63,7 +63,7 @@ restart: continue; } 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) { next = i - 17; |