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 5D91D47B77 for ; Fri, 3 Nov 2023 04:45:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E343768CC8B; Fri, 3 Nov 2023 06:45:02 +0200 (EET) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C38F68CC82 for ; Fri, 3 Nov 2023 06:44:56 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1cc921a4632so9932055ad.1 for ; Thu, 02 Nov 2023 21:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698986693; x=1699591493; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DzUt1lSTEjL0xxzmFwtxKeAqZSHp9tfnhEFbCWUx0eY=; b=F+1eJdbBeQe+2N0Nd0Lb/4Da9g99gd3BqJS47PZuZWVenMX/vXxdo6VRNimJ84AXj7 9dGGfFi0w8cqtt8XlEdwxbAbjFQjEYI3mDWomMBmSWebJObSlXxlzFHJ1aVZA5QCdufV GA0xxuRq0EIiSD3Sx319efxp2CQJtyihMLy2PU16W/7WagX+6BB5fYMcEA3V3P2Oe6Dk wXdd/TWT8jpBrPKTKmCKtHfQ7c6NZf+lv1dvAAEMq015lMsSNtQeuW2Ez8uBjzHBAt6h 9msUWUAZjDPCNHsmsm07IS+5CBZRkItV+CdOF5evVlN1phxiLWUl2mD43Gt9WMzeGyRa SnVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698986693; x=1699591493; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DzUt1lSTEjL0xxzmFwtxKeAqZSHp9tfnhEFbCWUx0eY=; b=nTsqMwPOrd1FfWm8gLnmYOfQWDRtbz9AKGi5GtqqRt0ZSr7qokMBbiSSHfcYBFeiU1 IT2st4th+fuc2XgKaMbAq3HwIk5TKu0Z5nQc0FQ0v1v5FmcOESxLY8WQhaYTGwsDXwGI yOmIE4gkqreakqi6iqxjz5HJ03Z0/Hf99NzTXMxeOQH4SGUtY2C/eJ+Hx6pqn9QLEabH uqCBeQees/N+Xr83W+ZzScybYyuPJk34AuQiQjYLAudGhmIppvKGeFo39KQRPeoC5uiE Ku+i+ys+SM236gWQBsxe4m0NkYpsNsLLUxAX0/EJWPN/zG7UWpF5ZJ1KDxjTu2hvclZT 5iDQ== X-Gm-Message-State: AOJu0YzvPHOaR5K7XMqHoYOLGgiw3kJPKDcORB2LpP0NlK2ZkYSDlM8/ nTtqT/hbdtaAxsQ0g57MAjkIz0K10A97hQ== X-Google-Smtp-Source: AGHT+IHO2tHdNlHrvNXIoPwH/s1ZKF59Tn1hF/tKvUcmwY8xPxnqFBpsvw4odtb33vhuG+flW9isVg== X-Received: by 2002:a17:902:f54e:b0:1cc:6b55:fc5 with SMTP id h14-20020a170902f54e00b001cc6b550fc5mr10708869plf.29.1698986693111; Thu, 02 Nov 2023 21:44:53 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:a98f:6200:548b:251b:82ae:3733]) by smtp.gmail.com with ESMTPSA id s9-20020a170902ea0900b001c5076ae6absm480726plg.126.2023.11.02.21.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 21:44:51 -0700 (PDT) From: Dave Johansen To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Nov 2023 22:44:49 -0600 Message-Id: <20231103044449.83331-1-davejohansen@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: Only append postfix to fmp4 init filename if not in the subdir 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: Dave Johansen 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: --- libavformat/hlsenc.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4ef84c05c1..dd1a461cce 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1931,6 +1931,30 @@ fail: return ret; } +static int validate_subdir(const char *fn) +{ + const char *subdir_name; + char *fn_dup = NULL; + int ret = 0; + + if (!fn) + return AVERROR(EINVAL); + + fn_dup = av_strdup(fn); + if (!fn_dup) + return AVERROR(ENOMEM); + subdir_name = av_dirname(fn_dup); + + if (!av_stristr(subdir_name, "%v")) { + ret = AVERROR(EINVAL); + goto fail; + } + +fail: + av_freep(&fn_dup); + return ret; +} + static int format_name(const char *buf, char **s, int index, const char *varname) { const char *proto, *dir; @@ -3019,7 +3043,7 @@ static int hls_init(AVFormatContext *s) av_freep(&vs->fmp4_init_filename); ret = format_name(hls->fmp4_init_filename, &vs->fmp4_init_filename, i, vs->varname); - } else { + } else if (validate_subdir(s->url) < 0) { ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); } if (ret < 0) -- 2.39.2 (Apple Git-143) _______________________________________________ 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".