RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-15 03:34:56 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/iff: Print error for cols/bpp/bytes being bad in decode_delta_j()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-07-06 10:50:22 +02:00
parent fcdbbbd85a
commit 55ef890b29
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/iff.c
View File

@ -865,8 +865,10 @@ static void decode_delta_j(uint8_t *dst,
for (g = 0; g < groups; g++) { for (g = 0; g < groups; g++) {
offset = bytestream2_get_be16(&gb); offset = bytestream2_get_be16(&gb);
if (cols * bpp == 0 || bytestream2_get_bytes_left(&gb) < cols * bpp) if (cols * bpp == 0 || bytestream2_get_bytes_left(&gb) < cols * bpp) {
av_log(NULL, AV_LOG_ERROR, "cols*bpp is invalid (%d*%d)", cols, bpp);
return; return;
}
if (kludge_j) if (kludge_j)
offset = ((offset / (320 / 8)) * pitch) + (offset % (320 / 8)) - kludge_j; offset = ((offset / (320 / 8)) * pitch) + (offset % (320 / 8)) - kludge_j;
@ -911,8 +913,10 @@ static void decode_delta_j(uint8_t *dst,
for (d = 0; d < bpp; d++) { for (d = 0; d < bpp; d++) {
unsigned noffset = offset + (r * pitch) + d * planepitch; unsigned noffset = offset + (r * pitch) + d * planepitch;
if (!bytes || bytestream2_get_bytes_left(&gb) < bytes) if (!bytes || bytestream2_get_bytes_left(&gb) < bytes) {
av_log(NULL, AV_LOG_ERROR, "bytes %d is invalid", bytes);
return; return;
}
for (b = 0; b < bytes; b++) { for (b = 0; b < bytes; b++) {
uint8_t value = bytestream2_get_byte(&gb); uint8_t value = bytestream2_get_byte(&gb);