From patchwork Mon Apr 19 18:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp756600iob; Mon, 19 Apr 2021 11:25:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJychtIkAeVJJpX/sXSnsAaLG0xOzVlj15EDFpUuEdpRCJU0+cVqGoyVzeBKDKRNbJ/pPilp X-Received: by 2002:a17:906:953:: with SMTP id j19mr23762861ejd.56.1618856706531; Mon, 19 Apr 2021 11:25:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618856706; cv=none; d=google.com; s=arc-20160816; b=X4nrU1tK82CqwRXlBhNoFY9W67i2wGazteFuwfLs2J9zSJbBAn+bZ2pPB0YXTcC/to 3gnVhBT8yEoj3zywAoVy1JATlTswpVHsJmX29/ead1lSjzxD66QatbkWb1COBXFFJha7 dmmn+xszvk3DuO2qsNcC6ZvZF5tkUKe6getoLJnIpvIJfKy1Mj0uwJnPOBcyr739nu16 cu3dNj0/WHTN4l5wWTg6LggDs1QfdfFSHE7FmNFAEPwi2En4MbRQJfRiubP7jBVVCuMD gmXHHgDtdH0kn9PO+oJJofcZjV4TXhA9Ct/tav6vKXeyHOYPWHud3vQChnbgvV7t/Prv 47Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=IYHoiq072V+YRDmCTi+/7Wfi4TijxBSvyLkSrWPQFi8=; b=AglTBs0NIQHc/v+GsUYAII6SeUThKewqrirRZu7w9IkpXSl5o3liwNJs4HtrVEHoMB KJY5wFfsbfCQL1fZJUIHaue09QbdHtlwwgJEi8r8tOr18ZsfJbenQzRiQ5i4QbEckO3Y gSiHWzU3QJW8duzKEdo8F8QPyFYd1j05qAJn3kLOHalw7wYH7rBGQTFVTD4bQrp0pMwI NK2sdCq9IRJ6wLthjpomdDpPqaIbkpTCf1E5Y5UFXxjQdkpFI0CtY8wR1MM8ic/lZBI5 u6FREcAq9pe8D/GOgVaTuWpv0N50GHGljSTt3yWxQiXi9J35LLzqyyOR05lkjxFeCA23 608g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u23si12903765ejx.579.2021.04.19.11.25.06; Mon, 19 Apr 2021 11:25:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D27D668025E; Mon, 19 Apr 2021 21:24:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39842680136 for ; Mon, 19 Apr 2021 21:24:48 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lYYZk-005krk-0I for ffmpeg-devel@ffmpeg.org; Mon, 19 Apr 2021 20:24:48 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id YYYmlPiAVljeHYYYmltlkT; Mon, 19 Apr 2021 20:23:48 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=-KN1DE7n4j4oi_bJ3bsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 19 Apr 2021 20:23:43 +0200 Message-Id: <20210419182346.4445-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210419182346.4445-1-michael@niedermayer.cc> References: <20210419182346.4445-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBu2m8B3WDCMJZR0X7JeupBWSW0kdg0JYyJ1X2qwvyyQb45b+JHCi76evJxw5NDvs9UMP6yM9SIN6fNg4OLeUNceaAQ2wUU9IHLTOHsT7b0nZ8LCfj/B s2phGLuJCcxrbhcxtayuqxcZkJj4DNwCxWoNjJTOx+FO4EFmi3x43EII Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/adpcm: Set vqa_version before use in init 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SWQGfi2zGKvq Fixes: null pointer dereference Fixes: 33172/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_WS_fuzzer-5200164273913856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/adpcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index be14607eac..2deefeb651 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -191,6 +191,8 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) avctx->sample_fmt = AV_SAMPLE_FMT_S16P; break; case AV_CODEC_ID_ADPCM_IMA_WS: + if (avctx->extradata && avctx->extradata_size >= 2) + c->vqa_version = AV_RL16(avctx->extradata); avctx->sample_fmt = c->vqa_version == 3 ? AV_SAMPLE_FMT_S16P : AV_SAMPLE_FMT_S16; break;