mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
pcx: fix rounding in bytes_per_scanline check
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
034a125c8c
commit
6462268e74
@ -119,7 +119,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
bytes_per_line = bytestream2_get_le16u(&gb);
|
||||
bytes_per_scanline = nplanes * bytes_per_line;
|
||||
|
||||
if (bytes_per_scanline < w * bits_per_pixel * nplanes / 8) {
|
||||
if (bytes_per_scanline < (w * bits_per_pixel * nplanes + 7) / 8) {
|
||||
av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user