From patchwork Thu Jan 5 00:40: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: 2057 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5077276vsb; Wed, 4 Jan 2017 16:41:12 -0800 (PST) X-Received: by 10.28.66.194 with SMTP id k63mr65097202wmi.140.1483576872358; Wed, 04 Jan 2017 16:41:12 -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 m6si54425387wjx.216.2017.01.04.16.41.12; Wed, 04 Jan 2017 16:41:12 -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 EE4B5689FA3; Thu, 5 Jan 2017 02:41:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE521680C5C for ; Thu, 5 Jan 2017 02:40:57 +0200 (EET) X-QQ-mid: bizesmtp3t1483576858tfo7wxjkn Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 05 Jan 2017 08:40:57 +0800 (CST) X-QQ-SSF: 01100000008000F0F621000A0000000 X-QQ-FEAT: 9NFkmNiL4hcjbU20BSjfZJCkyr9qKfOVYKaVHiS/PIiIOiNljlVvOyPrldrhw 3eqBgLqXBrpQCEvLfEbpeWFWmZwo6F40qM1mrdK3883i0aL+7xLjQjUSHv5GyAZmNJmJBUo rSq0B57EZgQmUBnsjJWx2l3Dafx2f5L1krYP+iTzOKOTV6yZmn4kEtQ5Oa0hqyRNFWQaQi2 CEFUdDSDxPMvKJHWpUoXse6vWk6MQuq/t0Ik48MGY0Rcznle4FliXXHitzUVTLJN9hEY3Ew GY/W/e6k1DWUls X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 08:40:56 +0800 Message-Id: <20170105004056.14716-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 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: 1323076 Passing null pointer loc to avformat_new_stream, which dereferences it fix: because the vtt_oc maybe have not value, so fix it. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 808a797..2a53908 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -406,10 +406,16 @@ static int hls_mux_init(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st; AVFormatContext *loc; - if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) - loc = vtt_oc; - else + if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { + if (vtt_oc) { + loc = vtt_oc; + } else { + av_log(s, AV_LOG_WARNING, "No VTT file found, so just can not use it\n"); + loc = oc; + } + } else { loc = oc; + } if (!(st = avformat_new_stream(loc, NULL))) return AVERROR(ENOMEM);