From patchwork Thu May 28 02:41:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 19909 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 DD8BD44A776 for ; Thu, 28 May 2020 05:43:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C325D68A454; Thu, 28 May 2020 05:43:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (smtpbg476.qq.com [59.36.132.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40D67680B6D for ; Thu, 28 May 2020 05:43:18 +0300 (EEST) X-QQ-mid: bizesmtp25t1590633688t7ffjkkn Received: from localhost (unknown [103.107.216.232]) by esmtp10.qq.com (ESMTP) with id ; Thu, 28 May 2020 10:41:28 +0800 (CST) X-QQ-SSF: 01100000002000Y0ZXF0B00A0000000 X-QQ-FEAT: RxUCDZI2pFr+FAA7X8O2xP8EFJxPWGXY6KlH4xJw/c72wNG3+mXM/m1wmtdLD 86liI7daQAO2H0UKF/OsGQpkXzYM68T11u13dCmtyDvqIlfXCLFpuiWtFBpAcguD4p/SogC f9XKDdHHkpkaOj6W0PQ0HAdQyau0LU56g0sjxBNVow+VkcV8utLNZEYXasjLQqYPKLKSH1r SYXPi7LXq6wwGbYDs+xGPs8wvhIy2lfHGSU2Ke+XNAYN3Y+6R3su7700j+MUXBYwD05oL7C 0dDFzAPTD6lBBkY+e1RRM8mYwLuQGt2/RxMf7jKwyvp2pe X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 May 2020 10:41:25 +0800 Message-Id: <20200528024126.19802-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/url: check return value of strchr 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 8687 workflow should return if there have no value of strchr Signed-off-by: Steven Liu --- libavformat/url.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/url.c b/libavformat/url.c index 6956f6dc10..20463a6674 100644 --- a/libavformat/url.c +++ b/libavformat/url.c @@ -90,6 +90,8 @@ static void trim_double_dot_url(char *buf, const char *rel, int size) if (p && (sep = strstr(p, "://"))) { sep += 3; root = strchr(sep, '/'); + if (!root) + return; } /* set new current position if the root node is changed */ @@ -150,6 +152,7 @@ void ff_make_absolute_url(char *buf, int size, const char *base, } /* If rel actually is an absolute url, just copy it */ if (!base || strstr(rel, "://") || rel[0] == '/') { + memset(buf, 0, size); trim_double_dot_url(buf, rel, size); return; } @@ -177,6 +180,8 @@ void ff_make_absolute_url(char *buf, int size, const char *base, if (sep) { sep += 3; root = strchr(sep, '/'); + if (!root) + return; } }