[FFmpeg-cvslog] avcodec/iff: Fix invalid pointer intermediates in decode_deep_rle32()
Michael Niedermayer
git at videolan.org
Fri Apr 24 02:14:49 EEST 2020
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Tue Apr 21 00:03:39 2020 +0200| [0516f88c76ea96f23238ed6ae0cd93ef3fb4672f] | committer: Michael Niedermayer
avcodec/iff: Fix invalid pointer intermediates in decode_deep_rle32()
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit bc41a29a5aa3c3dedba0a85b4aeb79a07eeeb1b4)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0516f88c76ea96f23238ed6ae0cd93ef3fb4672f
---
libavcodec/iff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index e5a75bd617..7f8f868ba9 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -590,7 +590,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) {
More information about the ffmpeg-cvslog
mailing list