From patchwork Sun Apr 3 10:07:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1455689pzb; Sun, 3 Apr 2022 03:08:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1pUsoba7tY0ONA4+NFelkOptwHgoImB4a9MaZvHb780iSDgUjiyblpmcT9zMHvmCPeshs X-Received: by 2002:a05:6402:4247:b0:419:3c6e:b0bf with SMTP id g7-20020a056402424700b004193c6eb0bfmr27655494edb.374.1648980504146; Sun, 03 Apr 2022 03:08:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648980504; cv=none; d=google.com; s=arc-20160816; b=mSun+js48vMPYSjmnQni8Pnfd8AJl48dPbKMaYi6932DX8SfjRGl8PO1Yp554RFSqF swO277XVYVR/gU0mHUIRH44jbfvv2aXm5eQbkAjnNkuM3ypzc0EGCmP1VfsJg2yDTFtn Y4InYMiu5L0EvqZD5IHyTL70YapE9t2+6jR08ktd1PVsO0+qkZXAVZXOtrYc3vpyLwZ6 VPDWkvGwib4FrKbdqfqn/frTQFXrSCA6qWrJ6Fy7IIGLZxcoCfcrA11hmQtegmnqXBQ9 /OIJnOV/9ktHdfB2pEus/WG7TbcC3zdfvAQTAOkxG4MagSPMJ+Fn/pPA6+DK7MzsaJQ7 Ni4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to; bh=xE/aF0RrdTnBpQ0lZoPMVqByR2VlTS9Fa5lFiR73Ikc=; b=b5nuLQYFR+9qQszCk0kjeElOdsVmzEcRwaEsI73wLW6hTx7Mfb1SbJHBhsj5CWj4QR iqiu+7mMv5ocwce61KxdlrLPll82J2Oip8ajpNbmitBZAG18qtQ44ZpSOgUFUFjiP5r8 Z91MEDQs0heWzeinyxfyf0BmoR0V+RXN20dKgB9hGb4QfvmTSIEGwk+xizn0R81j8Swp aNbUNODVlImP9umkvDaLQBbuCuIhGGnWMoU5u7nbBjjXC/5o8ld50wWXe6MyMtToTWPp CXPXklWzCe05D4xXdEKqCPwEXz32mlVIdf/7LuFWttW9FivT5FKxZqbUMu/WoI/Izu37 7pjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="1C/mrYmT"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o1-20020a056402438100b00418c2b5be23si4930566edc.261.2022.04.03.03.08.23; Sun, 03 Apr 2022 03:08:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="1C/mrYmT"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A39868B158; Sun, 3 Apr 2022 13:08:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-03.nifty.com (conssluserg-03.nifty.com [210.131.2.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E79168B0BE for ; Sun, 3 Apr 2022 13:08:08 +0300 (EEST) Received: from osamu-pc.kimura.local (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-03.nifty.com with ESMTP id 233A7qbP016046; Sun, 3 Apr 2022 19:07:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-03.nifty.com 233A7qbP016046 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1648980478; bh=kEMEnE/Zx4YjS8x3Yy0TxeFMa/2lE4Ee/Yktq6jxS9c=; h=From:To:Cc:Subject:Date:From; b=1C/mrYmTmJopekJMm8r9OjaEN804BtoTpS10k2KSrZbTXxt8zQzL2D2iZdNTd0DR9 1gSl2mJI2Y8hTfnJm0hWkzhT3PLL1J++vjjPu8aEQPn55Kv83Ztd80qHkqJCWAFblT v0HwOx2NrQlWgp9SFAT1jRexOo6zdLOIugubkf72/UgtaPosBz1DeK+EfZfajNjxN1 FOwJqIuu649MzxoyiEdfJN0Z1+Y3sXmj8aR19DG1U1dScQewc/OglQUmUjybOzJHD8 86rarVKgssyovbfaCk3l260jn3YtGOi4bfDlIS7EYKU2QSaKfLCEmmEFaIa82g7ZTw TrI7Fy17/5Wdg== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Apr 2022 19:07:51 +0900 Message-Id: <20220403100751.189390-1-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/mpegts.c: fix to check end of each descriptor of SDT 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: TADANO Tokumei Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XK6OntQvxcf/ Current code incorrectly check against end of section rather than end of descriptor. Signed-off-by: TADANO Tokumei --- libavformat/mpegts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da77b50669..ecffb01562 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2718,13 +2718,13 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len switch (desc_tag) { case 0x48: - service_type = get8(&p, p_end); + service_type = get8(&p, desc_end); if (service_type < 0) break; - provider_name = getstr8(&p, p_end); + provider_name = getstr8(&p, desc_end); if (!provider_name) break; - name = getstr8(&p, p_end); + name = getstr8(&p, desc_end); if (name) { AVProgram *program = av_new_program(ts->stream, sid); if (program) {