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 4760945C6C for ; Thu, 30 Mar 2023 01:51:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD04668C3D3; Thu, 30 Mar 2023 04:51:19 +0300 (EEST) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADB3468C178 for ; Thu, 30 Mar 2023 04:51:13 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id bi31so13120810oib.9 for ; Wed, 29 Mar 2023 18:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680141072; 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=NUxKk92pi+czs8C9PlOdhqKHSlYOT+5SJXmM4bbgH1s=; b=K79rbGqq1sSCLZCB+zUqk/Sg4jlY9CVOyU3NV/0ejkPgiMhxTlWEi8Dxa+xssYnW3n /eBK23doR60Qhjo5py78vFkh5+ISCSt+WANU+sHBUG/yljDiL75ePQtBLz6JNnc4eRpe wtf8dqytSMSyq8Aju0CRdVxa6xEVOMmWlFsHUrHPtTZCLDSv/+CbeA1BKWcKD7d7w4+y u0RJEQJOawKxiPOJ0DnxuMjr8gMtj0BA23e5ICTzhCjp4QGbpupS+EDNjqqOb5AEfXM0 v0in6qb/keIQtjCSIglAtcgGl2hgxN2yBqh6QmcwdBBdO3Sn6XnyfN9ChWrpgt3jUMeU k5kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680141072; 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=NUxKk92pi+czs8C9PlOdhqKHSlYOT+5SJXmM4bbgH1s=; b=fe3zBjj/Zx6Nq2oTEUCBcFbcJb5tQdh8B3cQgjQp+YGmbkK39oXrEqckGBmgLhpfWO Dyur8/GCRHtpA3h2bk7wfa8PlyKD6Rk6Gh7Gb9lNqmEEkcVTIvAkPo/oGO6qNK3YW9pv fWEdJSWVzPSMJ6Hhha15/JCqhpudJ4/VGafxDw4XHV+33dubC1WgD0civDlNULEFVOtJ CpuZkMgMkm45cnRNfCJpvCXs+eR8qZI1Umi7D7izlHa1j3ouOGiAvjnMgmft3VDUY5JV Wr4WCFDDQeu8ybOPGKGySZRBFTVCv/w2neJFqVkZLmQZTaYFgyg1K0NXdTmxzrTVxtGv ++Lg== X-Gm-Message-State: AO0yUKUqdwuHLqogAmmYfGwGeeVKCxXFCgKXUYXRK4IQD/lIzRCbjK2x m4+1hz7JLifT+Cfww+VQLRrUIL79JHw= X-Google-Smtp-Source: AK7set/DOhO1tPu4arUXrqemMcwlyp88hk2FCtLS0HTsgicALr4vsgeaTlKSZ2L7T0DC+21aQgTGKQ== X-Received: by 2002:aca:f15:0:b0:387:795b:567d with SMTP id 21-20020aca0f15000000b00387795b567dmr8832658oip.41.1680141072024; Wed, 29 Mar 2023 18:51:12 -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 s4-20020a0568080b0400b0038755008179sm8098557oij.26.2023.03.29.18.51.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Mar 2023 18:51:11 -0700 (PDT) Message-ID: <6c6b331b-9caf-1b5c-559c-cf4edc78281e@gmail.com> Date: Wed, 29 Mar 2023 22:51:09 -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: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> <20230324155213.3493-3-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH v2 3/7] avformat/matroskadec: export Dynamic HDR10+ packet side data 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/29/2023 9:43 PM, Andreas Rheinhardt wrote: >> @@ -3615,12 +3635,58 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, >> } >> >> static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, >> - AVPacket *pkt, >> + MatroskaTrack *track, AVPacket *pkt, >> const uint8_t *data, int size, uint64_t id) >> { >> - uint8_t *side_data = av_packet_new_side_data(pkt, >> - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, >> - size + 8); >> + uint8_t *side_data; >> + int res; >> + >> + switch (id) { >> + case 4: { >> + GetByteContext bc; >> + int country_code, provider_code; >> + int provider_oriented_code, application_identifier; >> + size_t hdrplus_size; >> + AVDynamicHDRPlus *hdrplus; >> + >> + if (!track->blockaddid_itu_t_t35) >> + break; //ignore >> + >> + bytestream2_init(&bc, data, size); >> + >> + /* ITU-T T.35 metadata */ >> + country_code = bytestream2_get_byte(&bc); >> + provider_code = bytestream2_get_be16(&bc); > This will add implicit overread checks; but you should check size > explicitly instead. > (The current behaviour of the bytestream2 API is to return 0 upon > overreads; yet one should not rely on this and it could e.g. be changed > so that bytestream2_get_byte returns 0xB5 and bytestream2_get_be16 0x3C > upon overread.) The only reason I'm using bytestream2 here was to not do a size check, as Anton suggested. Added one in any case, as well as using the u variants of bytestream2_get_* since it will not overread now. _______________________________________________ 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".