From 57271e4a685c51488cd69c2a52190280f012976e Mon Sep 17 00:00:00 2001
From: rcombs <rcombs@rcombs.me>
Date: Tue, 28 Mar 2023 16:29:51 -0400
Subject: lavf/oggdec: fix demux with unrecognized header packets

Fixes ticket #10289.

Co-authored-by: James Almer <jamrial@gmail.com>
---
 libavformat/oggparsevorbis.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libavformat')

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 061840c2ed..6fd12560bc 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 %d\n", pkt_type);
+        return 1;
+    }
+
+    if (os->psize < 1)
         return AVERROR_INVALIDDATA;
 
     if (priv->packet[pkt_type >> 1])
-- 
cgit v1.2.3