From patchwork Wed Apr 26 08:43:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 3495 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp213215vsd; Wed, 26 Apr 2017 01:44:32 -0700 (PDT) X-Received: by 10.28.197.12 with SMTP id v12mr14536675wmf.82.1493196272175; Wed, 26 Apr 2017 01:44:32 -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 d29si6146134wmi.22.2017.04.26.01.44.31; Wed, 26 Apr 2017 01:44:32 -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 674466882CD; Wed, 26 Apr 2017 11:44:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 707016805EA for ; Wed, 26 Apr 2017 11:44:18 +0300 (EEST) X-QQ-mid: bizesmtp3t1493196244toa0kjwqf Received: from localhost (unknown [114.245.84.118]) by esmtp4.qq.com (ESMTP) with id ; Wed, 26 Apr 2017 16:44:03 +0800 (CST) X-QQ-SSF: 01100000002000F0FF30000A0000000 X-QQ-FEAT: 1elLNeR01bZC6tBSwd9A9adTWSZmg5dqiGLBSA6LbfA7NjOwmAUMLxdRibWMR f/uziLkvmCjhqWjvedyMHIxVDzw/UCxB3cOSW5xR46DYViHPuRw//2IA2Ggn2Lg0OfRMe2J t2V/bZpkKHTS1fTC7p2LOS/Zekr1HgxFChEIyD/Q6ii2kWXgQssKLwXAuefdWpmW0Dem9c0 /hJ/eezPZYIHRkSXfmeFe640WqZABpx7RvFtc4E+dgk7HxtQsrrSDGfWzTcYpgOZ9n/NKJ0 tvcg== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Apr 2017 16:43:59 +0800 Message-Id: <20170426084359.69628-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <0F0379D2-30DB-4D2F-B438-61E2FFDD29E4@gmail.com> References: <0F0379D2-30DB-4D2F-B438-61E2FFDD29E4@gmail.com> 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" Fixes Coverity 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, sizeof(hls->key_file)); + av_strlcpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); } 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, sizeof(hls->key_file)); + av_strlcpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); } if (!*hls->iv_string) {