From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/dcadec: Do not explode EAGAIN
Date: Tue, 19 Sep 2023 00:35:32 +0200
Message-ID: <20230918223534.23567-3-michael@niedermayer.cc> (raw)
In-Reply-To: <20230918223534.23567-1-michael@niedermayer.cc>
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 <michael@niedermayer.cc>
---
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;
--
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".
next prev parent reply other threads:[~2023-09-18 22:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 22:35 [FFmpeg-devel] [PATCH 1/5] tools/target_dec_fuzzer: Adjust wmapro threshold Michael Niedermayer
2023-09-18 22:35 ` [FFmpeg-devel] [PATCH 2/5] avcodec/apedec: Fix an integer overflow in predictor_update_filter() Michael Niedermayer
2023-09-18 22:35 ` Michael Niedermayer [this message]
2023-09-18 23:24 ` [FFmpeg-devel] [PATCH 3/5] avcodec/dcadec: Do not explode EAGAIN James Almer
2023-09-19 18:18 ` Michael Niedermayer
2023-09-18 22:35 ` [FFmpeg-devel] [PATCH 4/5] avcodec/escape124: Do not return random numbers Michael Niedermayer
2023-09-18 22:35 ` [FFmpeg-devel] [PATCH 5/5] avcodec/decode: EAGAIN is not fully supported in decode_simple_internal() Michael Niedermayer
2023-09-18 23:30 ` James Almer
2023-09-19 18:24 ` Michael Niedermayer
2023-10-03 14:34 ` [FFmpeg-devel] [PATCH 1/5] tools/target_dec_fuzzer: Adjust wmapro threshold Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230918223534.23567-3-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git