From patchwork Mon Nov 20 06:45:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 6216 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3535483jah; Sun, 19 Nov 2017 22:46:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMZsIe4tWDVkzplaaXYGnXhLimDwtOT4zG/xdEbB0tl0AMrwZ2UfsSn2ThaaIpV/Wv88F7eS X-Received: by 10.223.196.247 with SMTP id o52mr10232440wrf.119.1511160387103; Sun, 19 Nov 2017 22:46:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511160387; cv=none; d=google.com; s=arc-20160816; b=It58uHA8JwPkwnwvYjqMcVG3uKjYnTZ+K1AbeUfpixcvGADGD7mC/RfimLr1wMnLfQ WDcIp+bdf4Nl7MPqTLdgISmkYOZYAK5NxxXTJvT8M6tyrQxj3H9yDGMS3cJjuVGlnHNS ukXp8CDlT1x9SGiLoDR2xmWj6DoqNVizK46iHnQT3AzhVteXZuo1BsoHZShxA8AgIjTc E2H6HybFt5zevchhrADXpyd9kg+M2vMHRscMZ26S9Ayjz9bCDX/JsI5eoJG/JcEPPnoX +kSCn4F+DvRJIdw+I4QwYZqK1sMh2+TumqCy/UZR+HJ+7P4Ym/ZSQKj2/a9LPa2sM1/J mk3A== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=LmgEGzT+Dd7tLfuzSwwbySnjJg62R/QQTX7XuttoEqQ=; b=XxT+9wEzfF6Ed8/xRndeSGMZUT85JoJSriOEXsawBoTFm8j24WwhN3wX9yHj95pu45 OJKqpNGkrXh3DzpwvfTq1yE2E5dOPzRC0pACu8Zn3PWb1MN51nQvxBOx8/Pn4OvGJaw+ ItOzLs00a4lDbEq4GNqqdE0BWvSekzQOQ1a2nFvsoMUum3G8cvinQoNpB3Y8gTAtYGDO WPKhS+SplJwKA6z0+38NFZAYz0V6jXysgpz1NP+RLFS2OTPNE9+mC/0irytXwGDhRsYv JQVL2iP8LrsaciAUx8mEXUIwwBEbAeA20tp3Ssm5ylMJO+EMNu/bFvID9do5ZseTlUi2 nF9A== 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 s81si6861690wma.42.2017.11.19.22.46.26; Sun, 19 Nov 2017 22:46:27 -0800 (PST) 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 F3476688287; Mon, 20 Nov 2017 08:46:07 +0200 (EET) 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 585DC68031D for ; Mon, 20 Nov 2017 08:45:59 +0200 (EET) X-QQ-mid: bizesmtp7t1511160354tykauisyq Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 20 Nov 2017 14:45:54 +0800 (CST) X-QQ-SSF: 01100000004000F0FJ80000A0000000 X-QQ-FEAT: rmCcnw0g6jWbhOJgJub46RtaoGoOBBD2HRwAz1Ow58KbVSvN0xiGAIV0em14T L+npHvAPIGPOtEVthq96lyCSl5/cFLeONPAoHvHtTSCqNkvt3ZVDLYEFJT2IdYEZ8eij+iF B7S8pZnmtC1S72cd3BL/ARDTQN2Mio9Mz8M6dDO0iK7m9K35m1j9YmimXSg5XhVkZe995CY +aa0NOVXPprKc3R4IxuQgDuOUfo3ZoNSmmLuLg5XTQ3s0tnz1+8fGtmbrFy5Ks7wjJhobaX ovPnvKZ35cA0teLuab46004x0= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 14:45:51 +0800 Message-Id: <20171120064551.29734-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/avio: check input URLContext value NULL 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 id: #6846 Signed-off-by: Steven Liu --- libavformat/avio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/avio.c b/libavformat/avio.c index 4dc468350c..e719326660 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -625,6 +625,8 @@ int64_t ffurl_size(URLContext *h) int ffurl_get_file_handle(URLContext *h) { + if (!h) + return AVERROR(EINVAL); if (!h->prot->url_get_file_handle) return -1; return h->prot->url_get_file_handle(h); @@ -632,6 +634,8 @@ int ffurl_get_file_handle(URLContext *h) int ffurl_get_multi_file_handle(URLContext *h, int **handles, int *numhandles) { + if (!h) + return AVERROR(EINVAL); if (!h->prot->url_get_multi_file_handle) { if (!h->prot->url_get_file_handle) return AVERROR(ENOSYS); @@ -647,6 +651,8 @@ int ffurl_get_multi_file_handle(URLContext *h, int **handles, int *numhandles) int ffurl_get_short_seek(URLContext *h) { + if (!h) + return AVERROR(EINVAL); if (!h->prot->url_get_short_seek) return AVERROR(ENOSYS); return h->prot->url_get_short_seek(h); @@ -654,6 +660,8 @@ int ffurl_get_short_seek(URLContext *h) int ffurl_shutdown(URLContext *h, int flags) { + if (!h) + return AVERROR(EINVAL); if (!h->prot->url_shutdown) return AVERROR(EINVAL); return h->prot->url_shutdown(h, flags);