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 358CA45E3D for ; Fri, 12 May 2023 20:26:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 586DE68BF36; Fri, 12 May 2023 23:26:33 +0300 (EEST) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01704680869 for ; Fri, 12 May 2023 23:26:26 +0300 (EEST) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-55a202d44e6so13487157b3.0 for ; Fri, 12 May 2023 13:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683923185; x=1686515185; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dJwmuVHyksJPhoPmA3w1DRjlkdcYQxIIQvLcxShBmwg=; b=LsPvMVNdVzfsEfcP+OCahUvx7N1e8eVvuQ5DZDI/4SUcrje5UILhE1RA9M5hI3JVRd Ieuw35mGb2qLrfr5uwR+TTIbMqfttQbh35pVsWzt60FkJwVRqm545yyT7qXvBPEEQ6rk 2b6SHt5x9ixThsCxnHQWeX0dULVeaOB6yh1quuJo7+X+CDzE/hwNhIxBnSP2RyAhLhnl M+t+pEfabNqMb3SrqvaSjgz/oit6/Umb0Hl8MgkEFQ1Aqw5QjCiNtWhevsU+AuRj3V4s 9VpVNilcQgJa9TJFijupnmgq8Mp8VlD8FgAVgb/sqMktT4IU2rTScvHbJYtetsuNUW2+ SXVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683923185; x=1686515185; 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=dJwmuVHyksJPhoPmA3w1DRjlkdcYQxIIQvLcxShBmwg=; b=TaH7hSikiunXAmZeH6kv/5r4/AeD13i1PpnnTXiJFV+fCqGQ0cDHaBrZd+IX4w0P0J 6+O+Szh//LNblrGsdiEGAprNUTlfpbBqqJjqRm65URSTMfDiKY9xU6ZIUg3H74xzb2Tf pTKvOCPqofHlY1uqMSh9GAo0ZRvgVH9aRgJpLcc/TgAqJL5fMNfKGqmDiL+DCDNqSw2q P1Zepze8YYSUcwczQGdl32PBNEiCrxGtHuXnewf0TwpVjsdJvonGq/PZ+PYGWHx8ia4B m5dace4G3rLL6+f87CMiH2mc8SFP0VPbclCGwqtA7pOjhXuD5fW5E2ghp1ndMEfTw+9D W8pA== X-Gm-Message-State: AC+VfDzGlWzq6olHbJTvJGAGaiJ+kPrFZ89/OXASG3Chb/oNJeqIfSmg HzC1XBsmN0VMNu9yXA+sAIBK7bJRcVA= X-Google-Smtp-Source: ACHHUZ4CG7WgMV7G3iiLYuTkinFbLg/TW7rk92qAkbBESDWj/YM7OtbhoRfjQLGCnAYG1X8a0kaLXw== X-Received: by 2002:a81:1b4e:0:b0:55a:1cdc:2ed3 with SMTP id b75-20020a811b4e000000b0055a1cdc2ed3mr15804278ywb.2.1683923185107; Fri, 12 May 2023 13:26:25 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id s128-20020a0dd086000000b0054605c23114sm5809081ywd.66.2023.05.12.13.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 13:26:24 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 May 2023 16:26:22 -0400 Message-Id: <20230512202622.29531-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hls: look for trailing GET headers with m3u8 extension check 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: Leo Izen 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: After commit 6b1f68ccb04d791f0250e05687c346a99ff47ea1 we refuse to use URLs of the form https://foo.bar/baz.m3u8?foo=bar because it fails the file extension check. This commit strips the ?foo=bar at the end before checking the file extension. Signed-off-by: Leo Izen --- libavformat/hls.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 11e345b280..6a97cced17 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2534,7 +2534,16 @@ static int hls_probe(const AVProbeData *p) strstr(p->buf, "#EXT-X-TARGETDURATION:") || strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) { - if (!av_match_ext(p->filename, "m3u8,hls,m3u")) { + char *request_qmark = strchr(p->filename, '?'); + int match_ext; + + if (request_qmark) + *request_qmark = '\0'; + match_ext = av_match_ext(p->filename, "m3u8,hls,m3u"); + if (request_qmark) + *request_qmark = '?'; + + if (!match_ext) { av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n"); return 0; } -- 2.40.1 _______________________________________________ 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".