From patchwork Mon Sep 18 22:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp136142pzb; Mon, 18 Sep 2023 15:36:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWLHwojSBJ2ncGPcyMyJXyC0Yb8UV5uW3rR+DUkH+bBx2lyt5oic+D7+THw0BzDefDuIrg X-Received: by 2002:a05:651c:10c:b0:2bc:d5f1:b9cf with SMTP id a12-20020a05651c010c00b002bcd5f1b9cfmr8374125ljb.27.1695076566189; Mon, 18 Sep 2023 15:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695076566; cv=none; d=google.com; s=arc-20160816; b=bYHGrHWAhGucVe+lx6q0IYftKqt1xo2GOnHWnP3z2NhAB/SvPvEd5I5V9Dgy+VlTpT /1rAOZu9AVxSX/9ao/VCf48r/nBuIzrroAOOlYMOR9iSa3l9P7HWHwsvv92FT3Z6TUVz O458KR67B3u8TlHH2D3nwtqgdRt1ESS48H/TW99k7QwRaTPUtlyNA3HGSFKZplQSbd/C 1xuFHyo/sZQmc+hbk3fshKDXWFXqev5S4TRNRpfJpBSSiSjD0osVcalN18tzubz1Gvo8 OCWYIIYDynqnyNyEsnXug9Uo6DB3zcENK3RkE1ctvxsXk/2K6+hiymU39VgQ+qIQNFQo AOiQ== 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=GCkcApfPnmqy+4vIlIP3vlFwWJcG2PND3rDsAqdWCO0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=jyzGNy6SPnTZQieVcGoFx9dDLu++Pb0LjidX9esZtSReYZ039HQEEdB/J3+qHonX9O 4nbmZKDZIKAhDG6uufQB1N+E5qL9yn8YuHkD/mthsS7WSMxBjHPGBy1S2zZLOcyqb53R 692OJ9G1uvq9NDmBCTQG7UEjDSP+pYfGpCVodqanL6T2MTMjh0leDjeYtlZ6y8TyhB+r 0eq9TZxyfKLA7NuMhG5wufYap6io4KcYMr8FRsPBZyGk68L2SG3P6gUOjIO405btaAWh UQKfpR98groZdByKsAASmH+mowZv9K21pB02sd6wAkSV9gCOeIN7nma8l6o7XAVd9IAm Gixg== 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 qt26-20020a170906ecfa00b009ad821deffcsi8851331ejb.17.2023.09.18.15.36.04; Mon, 18 Sep 2023 15:36: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 1E93668C805; Tue, 19 Sep 2023 01:35:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3905768C879 for ; Tue, 19 Sep 2023 01:35:38 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5A403FF803 for ; Mon, 18 Sep 2023 22:35:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Sep 2023 00:35:32 +0200 Message-Id: <20230918223534.23567-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230918223534.23567-1-michael@niedermayer.cc> References: <20230918223534.23567-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/dcadec: Do not explode EAGAIN 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: LlDkpSFCKmWO Fixes: out of array access Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DCA_fuzzer-6041088751960064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dcadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 3e3e3053bbe..070a9ae094d 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -221,7 +221,7 @@ static int dcadec_decode_frame(AVCodecContext *avctx, AVFrame *frame, && (prev_packet & DCA_PACKET_XLL) && (s->packet & DCA_PACKET_CORE)) s->packet |= DCA_PACKET_XLL | DCA_PACKET_RECOVERY; - else if (ret == AVERROR(ENOMEM) || (avctx->err_recognition & AV_EF_EXPLODE)) + else if (ret == AVERROR(ENOMEM) || (avctx->err_recognition & AV_EF_EXPLODE) && ret != AVERROR(EAGAIN)) return ret; } else { s->packet |= DCA_PACKET_XLL;