summaryrefslogtreecommitdiffstats
path: root/libavcodec/bmp_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-04-14 15:10:31 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-14 15:28:02 +0200
commit8e26bdd59bf559d00c7e60c53fff292de10139ff (patch)
tree85a629bfaa75290319395047b0023c932a5b1208 /libavcodec/bmp_parser.c
parente1a8f7818cc8bb975d856b7ba4cec4772e4a38ba (diff)
downloadffmpeg-streaming-8e26bdd59bf559d00c7e60c53fff292de10139ff.zip
ffmpeg-streaming-8e26bdd59bf559d00c7e60c53fff292de10139ff.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>
Diffstat (limited to 'libavcodec/bmp_parser.c')
-rw-r--r--libavcodec/bmp_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index c9493dc..7ab32a0 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;
OpenPOWER on IntegriCloud