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 662AB46EB7 for ; Mon, 18 Sep 2023 23:31:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B5AB68BFC9; Tue, 19 Sep 2023 02:31:49 +0300 (EEST) Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50A5D68C261 for ; Tue, 19 Sep 2023 02:31:43 +0300 (EEST) Received: by mail-vk1-f175.google.com with SMTP id 71dfb90a1353d-49032a0ff13so2171789e0c.0 for ; Mon, 18 Sep 2023 16:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695079901; x=1695684701; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=W1eJaDDds9mtkE2tjfPXz5ledaQBin//fHCKb6SJon0=; b=BiVx8J4yzMqBTaDnQUOuN+KVk5ZuqL7oK/CwtiNV07slh69Zh9IDdjvipLxNwFq93J K+CcFxS9SBuNHfKJZLsP3tnloEmnrl1M3U/AXDc3pXIfZJp/8qSfy82L93Pj5mPym9EY /c2SER7G0h8AFltZ6rEYuU3CrHW1NjHfS0OAtT5e6Z4MOoysvDm9jAC1tDOE8PX0lDZw p/6fu/Yx7PDF4VTZChuqSaBRlX30Ohbd5BwxwBwTPL2xeEtrFtSmct7XTx4OBX2JL7Ii L7viz38MqXWOKrpgoJu8cuPQYX7DdUM4UGjcV0QEARPPhUTaGQnv3B137nLvouwdTgoo NAaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695079901; x=1695684701; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W1eJaDDds9mtkE2tjfPXz5ledaQBin//fHCKb6SJon0=; b=KsXcMFlzSaD3IzmquVEXkXgVm0sJSCqyZMbrD7RnoT5bja1u1yjk/tZkWTAlnWvfnh Y13RyyfHNBKCqIBzjRR1l/TgYbCIRhK3dHTfB+jxhnrLXND15iXzMUxDucM/CMHNOiWN p2NzwNhclXM/RVUDEkKeA7rlBUMgj/Xq/4Ay9aEcC74cVbnEPIN2xS1oZ8uMcLsP/QdW GFHFm4prpBUvwxmLeBC9I9KL9GZZa3yhx69wNudnEmbEs22fwWdu6d5rgvT5hWCDhz3d Ajn1ks7dGM3pBEi9CX0G4IYVU0rOCNqBjCvGRdPQMMqbYFigcT5h5Bvi7RhpXsQhhcWc +9nQ== X-Gm-Message-State: AOJu0Yz+Szts5WJ2JiGB87pdAniqbAODopRAkv+2f1XbZivR7sBIfUgN qgSEJfyzrkLgIQHELDA9PTkeV3KczR8= X-Google-Smtp-Source: AGHT+IE2nLBY2V02QAtBHNnbjg8QmYXV/OWCnA1U+VnKe1hhIGQhGum9e1BL8773ihajMwFD+NLmOg== X-Received: by 2002:a54:4090:0:b0:3ab:6910:f5eb with SMTP id i16-20020a544090000000b003ab6910f5ebmr12434995oii.10.1695079469122; Mon, 18 Sep 2023 16:24:29 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a20-20020a9d74d4000000b006b74bea76c0sm4685668otl.47.2023.09.18.16.24.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Sep 2023 16:24:28 -0700 (PDT) Message-ID: <3e76238d-d969-9d75-c0c2-ca29a3699d3b@gmail.com> Date: Mon, 18 Sep 2023 20:24:25 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230918223534.23567-1-michael@niedermayer.cc> <20230918223534.23567-3-michael@niedermayer.cc> From: James Almer In-Reply-To: <20230918223534.23567-3-michael@niedermayer.cc> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/18/2023 7:35 PM, Michael Niedermayer wrote: > 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; Maybe instead do > diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c > index 3e3e3053bb..3926115f21 100644 > --- a/libavcodec/dcadec.c > +++ b/libavcodec/dcadec.c > @@ -217,11 +217,10 @@ static int dcadec_decode_frame(AVCodecContext *avctx, AVFrame *frame, > if (asset && (asset->extension_mask & DCA_EXSS_XLL)) { > if ((ret = ff_dca_xll_parse(&s->xll, input, asset)) < 0) { > // Conceal XLL synchronization error > - if (ret == AVERROR(EAGAIN) > - && (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)) > + if (ret == AVERROR(EAGAIN) { > + if ((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)) > return ret; > } else { > s->packet |= DCA_PACKET_XLL; So EAGAIN is handled in one place. LGTM either way. _______________________________________________ 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".