From owner-p4-projects@FreeBSD.ORG  Mon May 10 02:43:49 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C5031065674; Mon, 10 May 2010 02:43:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C542F106564A
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 02:43:48 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B3AC38FC12
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 02:43:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4A2hmM8008687
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 02:43:48 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A2hmYb008685
	for perforce@freebsd.org; Mon, 10 May 2010 02:43:48 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 10 May 2010 02:43:48 GMT
Message-Id: <201005100243.o4A2hmYb008685@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178020 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 02:43:49 -0000

http://p4web.freebsd.org/@@178020?ac=10

Change 178020 by gcooper@gcooper-bayonetta on 2010/05/10 02:43:39

	Add sanity checks for -s and -S to avoid ENAMETOOLONG errors later on.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#7 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#7 (text+ko) ====

@@ -14,8 +14,10 @@
 
 #include <sys/param.h>
 #include <err.h>
+#include <errno.h>
 #include <getopt.h>
 #include <libgen.h>
+#include <limits.h>
 #include <stdlib.h>
 
 #include <pkg.h>
@@ -122,10 +124,16 @@
 	    break;
 
 	case 's':
+	    if (strlen(SrcDir) > PATH_MAX)
+		errx(EXIT_FAILURE, "-s argument invalid: %s",
+		    strerror(ENAMETOOLONG));
 	    SrcDir = optarg;
 	    break;
 
 	case 'S':
+	    if (strlen(BaseDir) > PATH_MAX)
+		errx(EXIT_FAILURE, "-s argument invalid: %s",
+		    strerror(ENAMETOOLONG));
 	    BaseDir = optarg;
 	    break;