[FFmpeg-devel] [PATCH 2/5] avcodec/wmalosslessdec: Check block_align

[Paul B Mahol]

LGTM

On 10/19/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: NULL pointer dereference
> Fixes:
> 18331/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5652847445671936
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/wmalosslessdec.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
> index eb1db615ae..19bac949d4 100644
> --- a/libavcodec/wmalosslessdec.c
> +++ b/libavcodec/wmalosslessdec.c
> @@ -184,8 +184,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
>      unsigned int channel_mask;
>      int i, log2_max_num_subframes;
>
> -    if (!avctx->block_align) {
> -        av_log(avctx, AV_LOG_ERROR, "block_align is not set\n");
> +    if (avctx->block_align <= 0) {
> +        av_log(avctx, AV_LOG_ERROR, "block_align is not set or invalid\n");
>          return AVERROR(EINVAL);
>      }
>
> --
> 2.23.0
>
> _______________________________________________
> 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".