From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B2FCC42C20 for ; Fri, 30 Sep 2022 08:01:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DA7F68BB0B; Fri, 30 Sep 2022 11:01:07 +0300 (EEST) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0810468B28D for ; Fri, 30 Sep 2022 11:01:00 +0300 (EEST) Received: by mail-yb1-f175.google.com with SMTP id 63so4370045ybq.4 for ; Fri, 30 Sep 2022 01:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date; bh=d/mdpky3O4qL4WocF+0RcP4JcfD9czfBpR1X5/n1o48=; b=SU4YIzCKsR7TXqO2Zi66j9HfWXy5v+7tvpzjmOEI34k9cjZRCccsdc/uMUk7faktva Kk+U/qzq2UVFqyYV7Z7Upk2BSfwRPinX0IDMYRi9BVR+8zwEHEep2rdTNQDmi6hFoS+p gRP5vI9Cdq9sBigUs2Uln439ltBL1VcmCplfDHE6LKGguX7DkX3vUInA/u6AXDoG163J GiMMSqtmvIIJM/gk2qnMBoMQiPPQsp1r2322DXF541+TRh4OIGMyOh/qBKZ+GyjYE9lq IbRZnpqZO+Rgty7VHOjggNV/MJbJAgKIe7MN9/84xsWddzgtguSIptIh2ub27j48wj4K B0vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :x-gm-message-state:from:to:cc:subject:date; bh=d/mdpky3O4qL4WocF+0RcP4JcfD9czfBpR1X5/n1o48=; b=4bPDZsQv118jok5PW7T7KIAtjtqXMajnt+CcLJqocq0/CdWlDvn7JXzwkA7lv5TIAw FDybZDSyD0rKUXXzdH+Wiz3Pw1M5rpVh3sv34glK4tT4Qkhz/svzs7sLsdNt8HsN7DCR 2TOL6UJNtd/Xz5cxDUSD52WQKAkqORn/cw+mJnl3ughq02MrzzqV3dB1Pdnp4xZA7R0w hGoaCdiKi96+kOw4qRGwNEzHpv8kuOF6THMHx0MoTuygPqeC5XouRjpJf7i9/2H/E+Nc ZAytEjqbbHVGdHdUz5RkhJbSULXon9LirYB83zukinVNp9NBrblAlJFkg3O1PV5fdVoL 4QxA== X-Gm-Message-State: ACrzQf0Pk0G8mNeqMYMBrvSYPrhL1CZEHG/93s45NXpGST/1RKZG0Xmy iO/Qc2uRfORbq0lU8qfh5Mev77X6S2YMZEcevJZ2vMEf X-Google-Smtp-Source: AMsMyM7M6ejmw2eVwnjhrEwYTy8rKqjbciRwWQCrGgpvy5feeBeS1MLypyGsxscpYXxpGBefJn85uvAryiL3Xh8EHu0= X-Received: by 2002:a25:8a92:0:b0:6b4:506d:f2ad with SMTP id h18-20020a258a92000000b006b4506df2admr7042286ybl.586.1664524858347; Fri, 30 Sep 2022 01:00:58 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:928d:0:0:0:0:0 with HTTP; Fri, 30 Sep 2022 01:00:57 -0700 (PDT) In-Reply-To: <20220929230927.28439-3-michael@niedermayer.cc> References: <20220929230927.28439-1-michael@niedermayer.cc> <20220929230927.28439-3-michael@niedermayer.cc> From: Paul B Mahol Date: Fri, 30 Sep 2022 10:00:57 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH 3/3] avcodec/mlpdec: add max channels check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/30/22, Michael Niedermayer wrote: > Fixes: out of array access > Fixes: > 51648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-4644322217164800 > Make sure that this "fix" does not break Mono.thd decoding. The sample is on trac ticket. Thanks. > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/mlpdec.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c > index 635f92895c5..0b0eb759901 100644 > --- a/libavcodec/mlpdec.c > +++ b/libavcodec/mlpdec.c > @@ -547,6 +547,9 @@ static int read_restart_header(MLPDecodeContext *m, > GetBitContext *gbp, > return AVERROR_PATCHWELCOME; > } > > + if (max_channel + 1 > MAX_CHANNELS || max_channel + 1 < min_channel) > + return AVERROR_INVALIDDATA; > + > s->min_channel = min_channel; > s->max_channel = max_channel; > s->coded_channels = ((1LL << (max_channel - min_channel + 1)) - 1) > << min_channel; > -- > 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". > _______________________________________________ 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".