From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 20 Apr 2020 22:03:39 +0000 (+0200)
Subject: avcodec/iff: Fix invalid pointer intermediates in decode_deep_rle32()
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bc41a29a5aa3c3dedba0a85b4aeb79a07eeeb1b4;p=ffmpeg

avcodec/iff: Fix invalid pointer intermediates in decode_deep_rle32()

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index acd6519b06b..2e65e266d0f 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -715,7 +715,7 @@ static void decode_deep_rle32(uint8_t *dst, const uint8_t *src, int src_size, in
 {
     const uint8_t *src_end = src + src_size;
     int x = 0, y = 0, i;
-    while (src + 5 <= src_end) {
+    while (src_end - src >= 5) {
         int opcode;
         opcode = *(int8_t *)src++;
         if (opcode >= 0) {