1. ffmpeg
  2. Commit 62e87d065b9bae0f9d5319a88c8af0a0c3bdd084
Browse code

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>

Michael Niedermayer authored on 2016/04/14 22:10:31
Showing 1 changed files
libavcodec/bmp_parser.c
History View file @ 62e87d0
... ... 
@@ -63,7 +63,7 @@ restart:
63 63 
                     continue;
64 64 
                 }
65 65 
                 bpc->pc.frame_start_found++;
66 
-                bpc->remaining_size = bpc->fsize + i - 17;
66 
+                bpc->remaining_size = bpc->fsize + FFMAX(i - 17, 0);
67 67
68 68 
                 if (bpc->pc.index + i > 17) {
69 69 
                     next = i - 17;