From patchwork Thu Aug 29 09:33:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 14779 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2CBDF449258 for ; Thu, 29 Aug 2019 12:34:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 048D96808F1; Thu, 29 Aug 2019 12:34:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2233B6801E0 for ; Thu, 29 Aug 2019 12:34:17 +0300 (EEST) X-QQ-mid: bizesmtp28t1567071221tnp13z2k Received: from localhost (unknown [223.104.3.22]) by esmtp10.qq.com (ESMTP) with id ; Thu, 29 Aug 2019 17:33:39 +0800 (CST) X-QQ-SSF: 01100000000000K0ZQF0000A0000000 X-QQ-FEAT: G/QWXYAa6dkAoNVNSvz5r5fNe42RmZ0IAjUj+cNsutwkA0fWrFGOXwmTLEeEv r8futIEOJh18IGR6gSRi38Eh31B3+fgGXSxvhtoCixWEN7yWQ6+34b604C2CvYtqbM6tMkl HDk9TJsjaffkYwDUbwAH7K+k5GOYpD+ASYF5gRvK8KcCrkeW9DVvkMdxvAIFaYW0TbkXOG2 vC/ubhjX6TBQLztiq5bnNY8+YdmLIxSD/rfkDQfs4ueu/gRZh6kFAclI8dDC5lUFe7qWNSU 0VZVfR8TxqbolcMBJnDATcq2zXBNyFbZQI1EOcyjLDjyLIl0U/9A7bKOM= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2019 17:33:34 +0800 Message-Id: <20190829093334.28314-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/dashdec: start from the root uri when baseURL is start with '/' X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 8097 Signed-off-by: Steven Liu --- libavformat/dashdec.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index f82a750d6f..a6f75514f6 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -794,12 +794,22 @@ static int resolve_content_path(AVFormatContext *s, const char *url, int *max_ur continue; } text = xmlNodeGetContent(baseurl_nodes[i]); - if (text) { + if (text && !av_strstart(text, "/", NULL)) { memset(tmp_str, 0, strlen(tmp_str)); if (!ishttp(text) && isRootHttp) { av_strlcpy(tmp_str, root_url, size + 1); } start = (text[0] == token); + if (start && av_stristr(tmp_str, text)) { + char *p = tmp_str; + if (!av_strncasecmp(tmp_str, "http://", 7)) { + p += 7; + } else if (!av_strncasecmp(tmp_str, "https://", 8)) { + p += 8; + } + p = strchr(p, '/'); + memset(p + 1, 0, strlen(p)); + } av_strlcat(tmp_str, text + start, tmp_max_url_size); xmlNodeSetContent(baseurl_nodes[i], tmp_str); updated = 1;