Commit ff7e2172 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/wmalosslessdec: move channel check up

Fixes: out of array access
Fixes: 2nd part of 18429/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-6210814364614656

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 891bcc4a)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 0dc4c9f7
...@@ -190,6 +190,16 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -190,6 +190,16 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (avctx->channels < 0) {
av_log(avctx, AV_LOG_ERROR, "invalid number of channels %d\n",
avctx->channels);
return AVERROR_INVALIDDATA;
} else if (avctx->channels > WMALL_MAX_CHANNELS) {
avpriv_request_sample(avctx,
"More than %d channels", WMALL_MAX_CHANNELS);
return AVERROR_PATCHWELCOME;
}
s->avctx = avctx; s->avctx = avctx;
ff_llauddsp_init(&s->dsp); ff_llauddsp_init(&s->dsp);
init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);
...@@ -263,16 +273,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -263,16 +273,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
++s->lfe_channel; ++s->lfe_channel;
} }
if (s->num_channels < 0) {
av_log(avctx, AV_LOG_ERROR, "invalid number of channels %"PRId8"\n",
s->num_channels);
return AVERROR_INVALIDDATA;
} else if (s->num_channels > WMALL_MAX_CHANNELS) {
avpriv_request_sample(avctx,
"More than %d channels", WMALL_MAX_CHANNELS);
return AVERROR_PATCHWELCOME;
}
s->frame = av_frame_alloc(); s->frame = av_frame_alloc();
if (!s->frame) if (!s->frame)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment