From patchwork Wed Mar 21 19:33:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 8076 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5518037jad; Wed, 21 Mar 2018 12:34:10 -0700 (PDT) X-Google-Smtp-Source: AG47ELuF/jGUKdVEWWqGnNCVRZu/2+dV1Vmvx3kHoqWTHagKZoFLRsJMy96PFCxBKJP/sBl7Oe+c X-Received: by 10.223.225.2 with SMTP id d2mr9044201wri.56.1521660850383; Wed, 21 Mar 2018 12:34:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521660850; cv=none; d=google.com; s=arc-20160816; b=Zd5VCkCLA9VE+RpHFJSP4zEKhuWlce+osncISnHD4Ru+HGTNlFQ+XsD0sZhZ3DBpdJ qwTkKM5En5F/KfCsSCsrMj2ZxmHLGZ39bg03D9yJiY+RL/aXrR/nseZ4RNGSA7kNMZqh 8PlQTchXMetmGKjMJgi/xoJ9RWiSpKQqKPlpG0F4Y+55UeOtLA35E+L/3343qR1IV3c6 b6yvr3udITSmllEmKLV2fxGOdqJxmM+q9KlEpMmuIi57mGHA68iPmuCQFBhWR7ruJKDr QJst+PAQXrOiECOl32UvlnYPFz9ABsVZyfKS0Drcxk3WJ+RmfTdz0y5HXybOUEAyw5Ht WNIA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=BL3Sxlfq3PPGvR7z00gDYaEl/grq9ws04fJBL37f670=; b=j2yTiRRYijhifZ8ofMsMxAGQeiI2tDKaXS26E4qrgXE4TpdFiYeeduVpFHybV+JduD o9hpntNEkANM7A+kKEtZperQpoPE4+V4F+6Qbw/r615sW/uQuB807adNCuhkeTHgIgPi 5pOU28NNlxWVDcY73q3NfMe03gs0O1WtEOlV3SrwUebu/tc26aMNGyY20LLF4sQdMgRz gQgfWC5mL8I+a3PgZWe/xDVGkhCLYIcw0ZaZOuJ5C2JHC1Dc501tRlCM+VDQvlmfr8Lj IuEb6B8nPnSHe2bu3ghG4dk3PUhzb+EBo0cty/n66ElKBLj/k9aDxXpKDcIg0qfxzL48 hQFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=r9Tg+3Ag; 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 u7si3725286wrg.193.2018.03.21.12.34.09; Wed, 21 Mar 2018 12:34:10 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=r9Tg+3Ag; 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 D93DC689940; Wed, 21 Mar 2018 21:33:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BECB689940 for ; Wed, 21 Mar 2018 21:33:47 +0200 (EET) Received: from localhost.localdomain (ip4d161124.dynamic.kabel-deutschland.de [77.22.17.36]) by btbn.de (Postfix) with ESMTPSA id CB4DE11DA4C; Wed, 21 Mar 2018 20:34:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1521660841; bh=BZiYKxhcuV6NRYKibUNH5E73wMi46j2Q+ftCb08NW6w=; h=From:To:Cc:Subject:Date; b=r9Tg+3AgXVWPIiyKJPaQ9DCz5sXUHE74zwFESkHSCElZgChfUhuz9dSgd715J8hGK 3wpkT8dGm6dnCE6IEuLa1213D8pEwGzjy3AKBHDqOj+AMxkrdMr7Gh1HdRmMvofPCn QgSlWO13i2fguX9b30bG0Vr0eQJbtybPQCADc86g= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 20:33:50 +0100 Message-Id: <20180321193350.2468-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: initialize saveptrs 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_strtok calls strspn on a non-NULL *saveptr, so not NULL initializing it is an issue. Fixes CID #1428568 --- libavformat/hlsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b7c6fbde6a..fa17776efe 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1873,7 +1873,8 @@ static int parse_cc_stream_mapstring(AVFormatContext *s) { HLSContext *hls = s->priv_data; int nb_ccstreams; - char *p, *q, *saveptr1, *saveptr2, *ccstr, *keyval; + char *p, *q, *ccstr, *keyval; + char *saveptr1 = NULL, *saveptr2 = NULL; const char *val; ClosedCaptionsStream *ccs;