diff mbox

[FFmpeg-devel,1/3] avcodec/adpcm: Check number of channels for MTAF

Message ID 20190923234336.30773-1-michael@niedermayer.cc
State Accepted
Commit 74bbf9bc8279e0b8eba89c8cca68e8ad7ff547ed
Headers show

Commit Message

Michael Niedermayer Sept. 23, 2019, 11:43 p.m. UTC 
Fixes: out of array access
Fixes: 17608/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_MTAF_fuzzer-5074936267276288

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

Comments

Paul B Mahol Sept. 24, 2019, 7:17 a.m. UTC | #1 
lgtm

On 9/24/19, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: out of array access
> Fixes:
> 17608/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_MTAF_fuzzer-5074936267276288
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/adpcm.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index fb126503d6..7f2ebfc99d 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -111,6 +111,10 @@ static av_cold int adpcm_decode_init(AVCodecContext *
> avctx)
>      case AV_CODEC_ID_ADPCM_MTAF:
>          min_channels = 2;
>          max_channels = 8;
> +        if (avctx->channels & 1) {
> +            avpriv_request_sample(avctx, "channel count %d\n",
> avctx->channels);
> +            return AVERROR_PATCHWELCOME;
> +        }
>          break;
>      case AV_CODEC_ID_ADPCM_PSX:
>          max_channels = 8;
> --
> 2.23.0
>
> _______________________________________________
> 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".
Michael Niedermayer Sept. 24, 2019, 10:25 a.m. UTC | #2 
On Tue, Sep 24, 2019 at 09:17:49AM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx
[...]
diff mbox

Patch

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index fb126503d6..7f2ebfc99d 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -111,6 +111,10 @@  static av_cold int adpcm_decode_init(AVCodecContext * avctx)
     case AV_CODEC_ID_ADPCM_MTAF:
         min_channels = 2;
         max_channels = 8;
+        if (avctx->channels & 1) {
+            avpriv_request_sample(avctx, "channel count %d\n", avctx->channels);
+            return AVERROR_PATCHWELCOME;
+        }
         break;
     case AV_CODEC_ID_ADPCM_PSX:
         max_channels = 8;