[FFmpeg-cvslog] avcodec/iff: decode_delta_j: Check that the number of bytes that will be read are available

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul  6 10:43:46 2016 +0200| [fcdbbbd85a16ce00198f53a21dbfdeea68412985] | committer: Michael Niedermayer

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

This should avoid long loops
related to CID1361958

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcdbbbd85a16ce00198f53a21dbfdeea68412985
---

 libavcodec/iff.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index ef9ce91..677de0f 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -865,7 +865,7 @@ static void decode_delta_j(uint8_t *dst,
             for (g = 0; g < groups; g++) {
                 offset = bytestream2_get_be16(&gb);
 
-                if (bytestream2_get_bytes_left(&gb) < 1)
+                if (cols * bpp == 0 || bytestream2_get_bytes_left(&gb) < cols * bpp)
                     return;
 
                 if (kludge_j)
@@ -911,7 +911,7 @@ static void decode_delta_j(uint8_t *dst,
                     for (d = 0; d < bpp; d++) {
                         unsigned noffset = offset + (r * pitch) + d * planepitch;
 
-                        if (bytestream2_get_bytes_left(&gb) < 1)
+                        if (!bytes || bytestream2_get_bytes_left(&gb) < bytes)
                             return;
 
                         for (b = 0; b < bytes; b++) {