Commit ceb2fe02 authored by Michael Niedermayer's avatar Michael Niedermayer

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

Fixes Ticket3687
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3c6d824b
......@@ -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;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment