[FFmpeg-devel] [PATCH] avformat/rawvideodec: check packet size

[Michael Niedermayer <michael@niedermayer.cc>]

Fixes: division by zero
Fixes: integer overflow
Fixes: 43347/clusterfuzz-testcase-minimized-ffmpeg_dem_V210X_fuzzer-5846911637127168

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/rawvideodec.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c
index 68547fc50ff..387c4ba80f5 100644
--- a/libavformat/rawvideodec.c
+++ b/libavformat/rawvideodec.c
@@ -42,6 +42,7 @@ static int rawvideo_read_header(AVFormatContext *ctx)
     enum AVPixelFormat pix_fmt;
     AVStream *st;
     int packet_size;
+    int ret;
 
     st = avformat_new_stream(ctx, NULL);
     if (!st)
@@ -62,6 +63,10 @@ static int rawvideo_read_header(AVFormatContext *ctx)
 
     avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num);
 
+    ret = av_image_check_size(s->width, s->height, 0, ctx);
+    if (ret < 0)
+        return ret;
+
     st->codecpar->width  = s->width;
     st->codecpar->height = s->height;
 
@@ -100,6 +105,8 @@ static int rawvideo_read_header(AVFormatContext *ctx)
         if (packet_size < 0)
             return packet_size;
     }
+    if (packet_size == 0)
+        return AVERROR(EINVAL);
 
     st->codecpar->format = pix_fmt;
     ctx->packet_size = packet_size;
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".