From patchwork Tue Apr 25 23:47:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 3492 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp74558vsd; Tue, 25 Apr 2017 16:48:38 -0700 (PDT) X-Received: by 10.28.185.10 with SMTP id j10mr3477917wmf.57.1493164118896; Tue, 25 Apr 2017 16:48:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 6si6203103wmx.83.2017.04.25.16.48.38; Tue, 25 Apr 2017 16:48:38 -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; 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 21B01689933; Wed, 26 Apr 2017 02:48:34 +0300 (EEST) 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 ADD9D680934 for ; Wed, 26 Apr 2017 02:48:26 +0300 (EEST) X-QQ-mid: bizesmtp5t1493164077t8ui6cupb Received: from localhost (unknown [221.222.199.218]) by esmtp4.qq.com (ESMTP) with id ; Wed, 26 Apr 2017 07:47:56 +0800 (CST) X-QQ-SSF: 01100000000000F0FF30000A0000000 X-QQ-FEAT: uTPXOWoz4bi9uwsV8tlxXNSMCfGMi+fHgdo44+yaWyQJMPVNe2YqHtBldPTC8 GtVjiqQp6dSUEg9zl4SzY6ePJX6X+R/PxbW1PTSR5ilf3MTWtgF4it04sbb4X6ozvPbY5gs jDRCubBgNcCs98SpmX9fHYJ88LYLtvD0oxUoJXYpRaKKyhvrbpuiXGK/55cm5G8QsCWJEtg l7V5Ft7wY0o+tpqAfTkttvr0wg0sQjbU7MmUFTHST0Tf00slxd31G9VPH9YMjH+CDgeHLt6 RYrQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Apr 2017 07:47:52 +0800 Message-Id: <20170425234752.67011-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix CID 1405135 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: 1405135 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3ec0f330fb..b7aafb73da 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -394,11 +394,11 @@ static int do_encrypt(AVFormatContext *s) av_strlcat(hls->key_basename, ".key", len); if (hls->key_url) { - strncpy(hls->key_file, hls->key_url, sizeof(hls->key_file)); - strncpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); + av_strlcpy(hls->key_file, hls->key_url, strlen(hls->key_url)); + av_strlcpy(hls->key_uri, hls->key_url, strlen(hls->key_url)); } else { - strncpy(hls->key_file, hls->key_basename, sizeof(hls->key_file)); - strncpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); + av_strlcpy(hls->key_file, hls->key_basename, strlen(hls->key_basename)); + av_strlcpy(hls->key_uri, hls->key_basename, strlen(hls->key_basename)); } if (!*hls->iv_string) {