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 E3EE445958 for ; Tue, 28 Mar 2023 20:44:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52BF468CC6B; Tue, 28 Mar 2023 23:44:49 +0300 (EEST) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E280168C7EE for ; Tue, 28 Mar 2023 23:44:42 +0300 (EEST) Received: by mail-oo1-f42.google.com with SMTP id l7-20020a4abe07000000b0053e1205c84bso1738937oop.9 for ; Tue, 28 Mar 2023 13:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680036281; 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=G5nRDzfsAH3dTPjLeKW99nwvxdzvPZiPScSizaKSFco=; b=B3AfP/GBk+/2pCYF7dLkuRuzkPO+F1W2L7kq1GATzwQ2uZvGcptpLgG4uKx3b+IV9H NWApYLjsB68J249y6hAb/qz69UK/xXZ+lfdDvEoxE/59BdjC8s7xZIu7mQKs6+fUv3QL tO+gdFWlqehrKfbU7WEVc7XY6MNCTmb0HKm2K176f2MBQ5ClV4jc7ceI7VNebgTJbAK8 Em+1cFd4NmOv9AN0uyw8PwA8mOS850YyivLCQBWEWg1ZFaziCJeQhoPV+uvJTHzRpxgn Uq3f9l3swdaOeeQ2Xr6Cn5frMZHBBlw4xWXPhfn2+KQCFPTQO+fmBzpOVp8I/N99thJQ QyIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680036281; 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=G5nRDzfsAH3dTPjLeKW99nwvxdzvPZiPScSizaKSFco=; b=oYdXqE5DMlNuyu2rIQ4axdJrCfFaYgVy8Wcdg5PcvbTH2HZGZ4KEUvU6X2pFTBUWiu Ars4sfcFi5iU1SjMKoexblwScBmadM4wmqdRmtLkYFG8SButC53g2ihixZP+VgVsu7Ua QzJmj3rMQ0tARJfTKW2zCBwejDeGiW84I9z5Ws4emQNgYM8SIdv+LXaUomSSWPK5Tiv7 gGKNBErSpOMylDcAJwMEhrA+bVHX/C7BE6neWc0H2nSh5EXHPkVMsiAMyqp31YbMqB31 CLzFAqe2HoBHOQqFm44Y+bFD+6/aK8VpkDlmkLM/YgC4zXwLZUfEZhHTJ9e6yB43wDdq 3jrg== X-Gm-Message-State: AO0yUKUCU0GvSIWnxjm8vnnsXmP5uZoC1gLQYmJ4aNTb9mjO/jP1Kq9M w5Lzvrg5QPrTCO6HCngBZ3E= X-Google-Smtp-Source: AK7set/tViVAtJrl1A+zNFRWTCasCEJlPLi1YBGF/vP2O4IAMlhPT8i0Re2ICLLV9NkwWDhhD22dvw== X-Received: by 2002:a4a:494a:0:b0:525:b0c8:4d4e with SMTP id z71-20020a4a494a000000b00525b0c84d4emr8483324ooa.0.1680036281475; Tue, 28 Mar 2023 13:44:41 -0700 (PDT) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y140-20020a4a4592000000b0053e56135a1esm1813265ooa.45.2023.03.28.13.44.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Mar 2023 13:44:41 -0700 (PDT) Message-ID: <649323bc-28c1-c934-1f3b-d41761c24f88@gmail.com> Date: Tue, 28 Mar 2023 17:44:38 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: en-US To: rcombs , ffmpeg-devel@ffmpeg.org References: <20230328203226.34753-1-rcombs@rcombs.me> <20230328203226.34753-2-rcombs@rcombs.me> From: James Almer In-Reply-To: <20230328203226.34753-2-rcombs@rcombs.me> Subject: Re: [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 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 3/28/2023 5:32 PM, rcombs wrote: > 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); nit: we normally use %d for ints. > + return 1; > + } > + > + if (os->psize < 1) > return AVERROR_INVALIDDATA; > > if (priv->packet[pkt_type >> 1]) LGTM. _______________________________________________ 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".