From owner-svn-src-all@freebsd.org  Fri May 20 06:02:45 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FA4EB41640;
 Fri, 20 May 2016 06:02:45 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6006C1967;
 Fri, 20 May 2016 06:02:45 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4K62iOI074668;
 Fri, 20 May 2016 06:02:44 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K62ibt074667;
 Fri, 20 May 2016 06:02:44 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605200602.u4K62ibt074667@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 20 May 2016 06:02:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r300265 - stable/10/usr.bin/mklocale
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2016 06:02:45 -0000

Author: truckman
Date: Fri May 20 06:02:44 2016
New Revision: 300265
URL: https://svnweb.freebsd.org/changeset/base/300265

Log:
  MFC r299524
  
    Use strlcpy() instead of strncpy() when copying the encoding value
    to ensure that the destination is NUL terminated.  Length truncation
    of one more character should not be an issue since encoding values
    that long are not supported by libc.  The destination string is
    treated as a NUL terminated string, but it is only passed to strcmp()
    for comparison to a set of shorter, fixed length strings, so this
    is not a serious problem.
  
  Reported by:	Coverity
  CID:		974769

Modified:
  stable/10/usr.bin/mklocale/yacc.y
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mklocale/yacc.y
==============================================================================
--- stable/10/usr.bin/mklocale/yacc.y	Fri May 20 05:33:26 2016	(r300264)
+++ stable/10/usr.bin/mklocale/yacc.y	Fri May 20 06:02:44 2016	(r300265)
@@ -123,7 +123,7 @@ entry	:	ENCODING STRING
 		      strcmp($2, "BIG5") &&
 		      strcmp($2, "MSKanji"))
 			warnx("ENCODING %s is not supported by libc", $2);
-		strncpy(new_locale.encoding, $2,
+		strlcpy(new_locale.encoding, $2,
 		    sizeof(new_locale.encoding)); }
 	|	VARIABLE
 		{ new_locale.variable_len = strlen($1) + 1;