[FFmpeg-devel] [PATCH 05/25] avcodec/magicyuv: Check early for invalid slices

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Sat Sep 26 13:27:44 EEST 2020


Every plane of each slice has to contain at least two bytes for flags
and the type of prediction used.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavcodec/magicyuv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
index d2f6a9b01e..6c29efc9f4 100644
--- a/libavcodec/magicyuv.c
+++ b/libavcodec/magicyuv.c
@@ -614,6 +614,8 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data,
                 return AVERROR_INVALIDDATA;
 
             s->slices[i][j].size = next_offset - offset;
+            if (s->slices[i][j].size < 2)
+                return AVERROR_INVALIDDATA;
             offset = next_offset;
         }
 
-- 
2.25.1



More information about the ffmpeg-devel mailing list