From patchwork Sat May 6 13:25:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1155758pzb; Sat, 6 May 2023 06:25:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4wETZ/8B3x/sHzt5WG2xaLPVM2/EF/LkI2uOLY4ItmZ1U5FTVglRSdCUizHmV2dUOM2Fr7 X-Received: by 2002:a17:907:d05:b0:94a:4e86:31bc with SMTP id gn5-20020a1709070d0500b0094a4e8631bcmr5315803ejc.13.1683379534059; Sat, 06 May 2023 06:25:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683379534; cv=none; d=google.com; s=arc-20160816; b=OfpUH5KEJ8wImFXM1rHReefynHHXnmmtuIBowTh4j6ZMzHWyZVBXCyihFTJ54OTBtR PzGhX+ffy/iGHJnX28WBbYC1TB1CtKEAP8keqE+21ClBLT+mn8nWAburGGOFewmQrlEm e38sg42v75NnI5/xir6qulheEq8Ly7/qBqudFTuYOmmGBUS4MtV60nMtQ4RNYb6go/33 +QHd1UHIIkZHbwmAcckEadqTG8OPRhqpEzOLZfcI84wUJWZTLs3uyjFLxSIEfRI5Omdg QZHLBVHGvpNcV1jqRlP20BvRzv5E/g+8S9zKI5jgXb5mlyMz+ObTgVxkos8VZnZ0bThj KDCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=WSSUaRucYctSc+VpFXMfva1RyQkEDS+yMLpEuRbjJ5A=; b=CE9RhKYEazikyTWs7WEXRm61IWnDcrKkJe5j4TabAFIcjMdp+f4iVlWyk4usS9ZDmd dumhzaC7ltBlKWIuyBVh3ln+TULMxZXN+ORI6XaPVb1xS6ozQWsyN4xMxkPdjm9SwEVF jYJiO3BvIZMALfehLMYLgULHv6X1h9+pDd6Ka8M/kS8pngNREpxGw6xh3Mu169efMZq3 Gosdv6QQxE4i1wmAk/JJC8nBIf0a83ocvvJlpuAvid2CHPl0E6wD2yQ2dNPDW4I7YAWg U5BYB+04xlvKDQi7e7XRAROd0OW/2ksjJt8i94YssFED2oubyUUQEBIRa6u4spUoCs6M qhtQ== ARC-Authentication-Results: i=1; mx.google.com; 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 vg18-20020a170907d31200b0094f848010c1si2790264ejc.459.2023.05.06.06.25.33; Sat, 06 May 2023 06:25:34 -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; 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 3B7A168C095; Sat, 6 May 2023 16:25:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B12FC68C0CF for ; Sat, 6 May 2023 16:25:06 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id F29B41BF206 for ; Sat, 6 May 2023 13:25:05 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 6 May 2023 15:25:03 +0200 Message-Id: <20230506132503.9524-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230506132503.9524-1-michael@niedermayer.cc> References: <20230506132503.9524-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mpeg: Fix filename extension check for subtitle file 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gbLYabKz8nJH This fixes undefined behavior and other issues. No testcase, this was found by code review Signed-off-by: Michael Niedermayer --- libavformat/mpeg.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 781c3162d6..fdc808dc50 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -756,12 +756,17 @@ static int vobsub_read_header(AVFormatContext *s) } fname_len = strlen(vobsub->sub_name); - ext = vobsub->sub_name - 3 + fname_len; - if (fname_len < 4 || *(ext - 1) != '.') { + if (fname_len < 4) { av_log(s, AV_LOG_ERROR, "The input index filename is too short " "to guess the associated .SUB file\n"); return AVERROR_INVALIDDATA; } + ext = vobsub->sub_name + fname_len - 3; + if (*(ext - 1) != '.' || strchr(ext, '/')) { + av_log(s, AV_LOG_ERROR, "The input index filename needs to have a 3 letter extension " + "to guess the associated .SUB file\n"); + return AVERROR_INVALIDDATA; + } memcpy(ext, !strncmp(ext, "IDX", 3) ? "SUB" : "sub", 3); av_log(s, AV_LOG_VERBOSE, "IDX/SUB: %s -> %s\n", s->url, vobsub->sub_name); }