avcodec/bmp_parser: delay frame end detection to the next header or EOF

Fixes Ticket3687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/bmp_parser: delay frame end detection to the next header or EOF
Fixes Ticket3687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ceb2fe02 · Michael Niedermayer · 3c6d824b · ceb2fe02
Commit ceb2fe02 authored 10 years ago by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 4 deletions
+8 -4
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@@ -62,11 +62,13 @@ restart:
                    bpc->pc.frame_start_found = 0;
                    continue;
                }
-                if (bpc->fsize <= ihsize + 14)
-                    bpc->fsize = INT_MAX/2;
                bpc->pc.frame_start_found++;
                bpc->remaining_size = bpc->fsize + i - 17;
-                goto restart;
+
+                if (bpc->pc.index + i > 17) {
+                    next = i - 17;
+                } else
+                    goto restart;
            } else if (bpc->pc.frame_start_found)
                bpc->pc.frame_start_found++;
        }
@@ -77,7 +79,9 @@ restart:
            bpc->remaining_size -= i;
            if (bpc->remaining_size)
                goto flush;
-            next = i;
+
+            bpc->pc.frame_start_found = 0;
+            goto restart;
        }
    }