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 3A41245945 for ; Tue, 28 Mar 2023 20:33:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47D6F68CC3A; Tue, 28 Mar 2023 23:32:50 +0300 (EEST) Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E63668CC24 for ; Tue, 28 Mar 2023 23:32:42 +0300 (EEST) Received: by mail-qv1-f41.google.com with SMTP id x8so10101570qvr.9 for ; Tue, 28 Mar 2023 13:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; t=1680035560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WaAkRQaNT8ye4DAV2jIXW3WHbzPmeSeEPCS3xUTgr+Y=; b=fsfV44v6hOw/bngGaQG5hNy+LrLw4tSMk7LES/65x2zi165D2RefGugMbD2BR6yt5S a664AkQvGBAUsMeX3lPmlKSGTT/NoGLcg9SXVc979ZAlYylqVch7b9hFRhcu92QPoC1n 4bTZOz3Ho9MV0Q9DhcPzKbbySCsIjELbNmOV4jYm6uBawh1gsDYcTW2JSX+Kh48Q5aMc Ydp7u8dj5BWvQm5h3WfM8+RcN1Ag5gA9XsxIZeEkO9RW+fTf9ONbyywDLHrqSsmAT33E mTdXy4mmpupQezjmz4c0ZXjN5Bb8pbs9uAowI0U8mqtWwcrctHvgKSBiaH2k0V3Hqoc8 pfjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680035560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WaAkRQaNT8ye4DAV2jIXW3WHbzPmeSeEPCS3xUTgr+Y=; b=lcA1stfCE8duMX452qHMTdlwlbJ07IUUv5ZabRS7Ss0R0A03QGXBzAujLPixiepPb2 ZSOIpNlSUDTilODahK6ToDD/haUXsVIUUWNf7eSb5UicrIO9MHR0BvkPisOgEhmfwdBp 16+e4JRBX4OcXf5XEZyQ9S/92AtHieVnzJapn9kPA7Li2U/3PL6n3qTV62W74tM8UPNz ZhDFcyqR9nVu/MR2WEwsYmGE+To8RKkupIxRL7+lsO0WxxB1heWmGEjtijD5EMSjUuTr q5WTGembcr5AeaBFwa1Kzx6nhKsVLic0klsA7AdeFuGx74vIqFQgilZSFkYfCxSxNrah kxpg== X-Gm-Message-State: AAQBX9fvvv6VUH8/ZAPwAYLaIFV8LQozUYFkGL1wxqL7FqiP2INf/GCW 25rnIn9vgIjNFsaKZDiDL3/PdVOgVR7h6w0MClZJ X-Google-Smtp-Source: AKy350bx1TKfnpx/AxtS+6aH8w7sLBrXHOL2EuxZCVGhTNjk+AuiBgy+nZXbrqtKE86xrGy7nTfGmQ== X-Received: by 2002:ad4:5ba5:0:b0:56b:ff69:7df8 with SMTP id 5-20020ad45ba5000000b0056bff697df8mr19309201qvq.51.1680035560630; Tue, 28 Mar 2023 13:32:40 -0700 (PDT) Received: from localhost.localdomain ([2600:4040:b38d:7a01:d0e8:dbe5:9479:393d]) by smtp.gmail.com with ESMTPSA id r13-20020a0cf60d000000b005dd8b9345d7sm4033888qvm.111.2023.03.28.13.32.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Mar 2023 13:32:40 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 16:32:26 -0400 Message-Id: <20230328203226.34753-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230328203226.34753-1-rcombs@rcombs.me> References: <20230328203226.34753-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf/oggdec: fix demux with unrecognized header packets 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 Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes ticket #10289. Co-authored-by: James Almer --- 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".