From owner-svn-src-head@FreeBSD.ORG  Tue Jan 22 22:41:13 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2D7A4D60;
 Tue, 22 Jan 2013 22:41:13 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 20B1EA99;
 Tue, 22 Jan 2013 22:41:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MMfDCI043442;
 Tue, 22 Jan 2013 22:41:13 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MMfCEY043440;
 Tue, 22 Jan 2013 22:41:12 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201301222241.r0MMfCEY043440@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 22 Jan 2013 22:41:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245828 - head/usr.sbin/pkg_install/lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 22:41:13 -0000

Author: bapt
Date: Tue Jan 22 22:41:12 2013
New Revision: 245828
URL: http://svnweb.freebsd.org/changeset/base/245828

Log:
  Use snprintf instead of strc* functions and add bounds checking when creating
  pkgngpath
  
  Submitted by:	sbz, gahr

Modified:
  head/usr.sbin/pkg_install/lib/lib.h
  head/usr.sbin/pkg_install/lib/pkgng.c

Modified: head/usr.sbin/pkg_install/lib/lib.h
==============================================================================
--- head/usr.sbin/pkg_install/lib/lib.h	Tue Jan 22 22:31:38 2013	(r245827)
+++ head/usr.sbin/pkg_install/lib/lib.h	Tue Jan 22 22:41:12 2013	(r245828)
@@ -99,7 +99,7 @@
  * Version of the package tools - increase whenever you make a change
  * in the code that is not cosmetic only.
  */
-#define PKG_INSTALL_VERSION	20121109
+#define PKG_INSTALL_VERSION	20130122
 
 #define PKG_WRAPCONF_FNAME	"/var/db/pkg_install.conf"
 #define main(argc, argv)	real_main(argc, argv)

Modified: head/usr.sbin/pkg_install/lib/pkgng.c
==============================================================================
--- head/usr.sbin/pkg_install/lib/pkgng.c	Tue Jan 22 22:31:38 2013	(r245827)
+++ head/usr.sbin/pkg_install/lib/pkgng.c	Tue Jan 22 22:41:12 2013	(r245828)
@@ -38,9 +38,10 @@ this system.";
 
 void warnpkgng(void)
 {
-	char pkgngpath[MAXPATHLEN];
+	char pkgngpath[MAXPATHLEN + 1];
 	char *pkgngdir;
 	char *dontwarn;
+	int rc;
 
 	dontwarn = getenv("PKG_OLD_NOWARN");
 	if (dontwarn != NULL)
@@ -48,8 +49,12 @@ void warnpkgng(void)
 	pkgngdir = getenv("PKG_DBDIR");
 	if (pkgngdir == NULL)
 		pkgngdir = "/var/db/pkg";
-	strcpy(pkgngpath, pkgngdir);
-	strcat(pkgngpath, "/local.sqlite");
+
+	rc = snprintf(pkgngpath, sizeof(pkgngpath) "%s/local.sqlite", pkgngdir);
+	if (rc >= sizeof(pkgngpath)) {
+		warnx("path too long: %s/local.sqlite", pkgngdir);
+		return;
+	}
 
 	if (access(pkgngpath, F_OK) == 0)
 		warnx(message);