From patchwork Thu Jan 5 00:28:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2056 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5073827vsb; Wed, 4 Jan 2017 16:29:11 -0800 (PST) X-Received: by 10.28.94.76 with SMTP id s73mr65388911wmb.107.1483576151438; Wed, 04 Jan 2017 16:29:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t1si59569561wmd.0.2017.01.04.16.29.11; Wed, 04 Jan 2017 16:29:11 -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 1DD93689FBB; Thu, 5 Jan 2017 02:29:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76306689C0B for ; Thu, 5 Jan 2017 02:28:57 +0200 (EET) X-QQ-mid: bizesmtp7t1483576138ta6vbyiyw Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 05 Jan 2017 08:28:58 +0800 (CST) X-QQ-SSF: 01100000008000F0F621000A0000000 X-QQ-FEAT: OthLD3hRvFFVPLzKock3pu1c2RRuvIoU3LjDiSbkwo6jupvHsnRhhZnlR/Syh Ba9COJ9NbEhwZbR0QEv/Ca777adnx9jqpmK+UK8dBiT1EGoHabDRf3gaoYhVuLm4b6j/7aa 1ohcXMldu9e4S7MHarKurYvuxG3dm2LwVK+2L8huCx+W3vMbMFpAnyPMJAU14VrHJiz4zkH sE6sGJDzica6VZo+PoihByz/Bo8nnaRpfZ512Y+g8Y6f8AcIVCdGGsiA2geLBc2QnDHX4vo D83cprfhIhkOPo X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 08:28:56 +0800 Message-Id: <20170105002856.14251-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix Explicit null dereferenced in hlsenc 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" CID: 1398228 Passing null pointer dirname to strlen, which dereferences it. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 808a797..3c6490a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -285,8 +285,8 @@ static int hls_delete_old_segments(HLSContext *hls) { path, strerror(errno)); } - if (segment->sub_filename[0] != '\0') { - sub_path_size = strlen(dirname) + strlen(segment->sub_filename) + 1; + if ((segment->sub_filename[0] != '\0')) { + sub_path_size = (!dirname) ? (strlen(segment->sub_filename) + 1) : (strlen(dirname) + strlen(segment->sub_filename) + 1); sub_path = av_malloc(sub_path_size); if (!sub_path) { ret = AVERROR(ENOMEM);