From: rcombs <rcombs@rcombs.me>
To: ffmpeg-devel@ffmpeg.org
Cc: James Almer <jamrial@gmail.com>
Subject: [FFmpeg-devel] [PATCH 2/2] lavf/oggdec: fix demux with unrecognized header packets
Date: Tue, 28 Mar 2023 16:32:26 -0400
Message-ID: <20230328203226.34753-2-rcombs@rcombs.me> (raw)
In-Reply-To: <20230328203226.34753-1-rcombs@rcombs.me>
Fixes ticket #10289.
Co-authored-by: James Almer <jamrial@gmail.com>
---
libavformat/oggparsevorbis.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 061840c2ed..4f48ebabc0 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -311,7 +311,12 @@ static int vorbis_header(AVFormatContext *s, int idx)
if (!(pkt_type & 1))
return priv->vp ? 0 : AVERROR_INVALIDDATA;
- if (os->psize < 1 || pkt_type > 5)
+ if (pkt_type > 5) {
+ av_log(s, AV_LOG_VERBOSE, "Ignoring packet with unknown type %i\n", pkt_type);
+ return 1;
+ }
+
+ if (os->psize < 1)
return AVERROR_INVALIDDATA;
if (priv->packet[pkt_type >> 1])
--
2.39.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-03-28 20:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 20:32 [FFmpeg-devel] [PATCH 1/2] lavc/vorbis_parser: quiet log on unrecognized packet types rcombs
2023-03-28 20:32 ` rcombs [this message]
2023-03-28 20:44 ` [FFmpeg-devel] [PATCH 2/2] lavf/oggdec: fix demux with unrecognized header packets James Almer
2023-03-28 20:42 ` [FFmpeg-devel] [PATCH 1/2] lavc/vorbis_parser: quiet log on unrecognized packet types James Almer
2023-03-28 20:43 ` James Almer
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=20230328203226.34753-2-rcombs@rcombs.me \
--to=rcombs@rcombs.me \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=jamrial@gmail.com \
/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