[FFmpeg-devel] [PATCH] avformat/mspdec: Check packet_size more completely

[Paul B Mahol]

lgtm

On Wed, Mar 3, 2021 at 11:01 AM Michael Niedermayer <michael at niedermayer.cc>
wrote:

> Fixes: OOM
> Fixes:
> 28348/clusterfuzz-testcase-minimized-ffmpeg_dem_MSP_fuzzer-4612055872831488
> Fixes:
> 28360/clusterfuzz-testcase-minimized-ffmpeg_dem_MSP_fuzzer-6245230626078720
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavformat/mspdec.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/mspdec.c b/libavformat/mspdec.c
> index b81d835a63..4845eb3729 100644
> --- a/libavformat/mspdec.c
> +++ b/libavformat/mspdec.c
> @@ -70,11 +70,12 @@ static int msp_read_header(AVFormatContext *s)
>
>      if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) {
>          cntx->packet_size =
> av_image_get_buffer_size(st->codecpar->format, st->codecpar->width,
> st->codecpar->height, 1);
> -        if (cntx->packet_size < 0)
> -            return cntx->packet_size;
>      } else
>          cntx->packet_size = 2 * st->codecpar->height;
>
> +    if (cntx->packet_size <= 0)
> +        return cntx->packet_size < 0 ? cntx->packet_size :
> AVERROR_INVALIDDATA;
> +
>      return 0;
>  }
>
> --
> 2.17.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".