virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/iff: decode_delta_j: Check that the number of bytes that will be read are available

Browse Source 
This should avoid long loops
related to CID1361958

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-07-06 10:43:46 +02:00
parent 3f5b7a2d73
commit fcdbbbd85a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/iff.c
View File

@@ -865,7 +865,7 @@ 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 (bytestream2_get_bytes_left(&gb) < 1) if (cols * bpp == 0 || bytestream2_get_bytes_left(&gb) < cols * bpp)
return; return;
if (kludge_j) if (kludge_j)
@@ -911,7 +911,7 @@ 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 (bytestream2_get_bytes_left(&gb) < 1) if (!bytes || bytestream2_get_bytes_left(&gb) < bytes)
return; return;
for (b = 0; b < bytes; b++) { for (b = 0; b < bytes; b++) {