From owner-p4-projects  Mon Oct  7 13:21:45 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6946837B401; Mon,  7 Oct 2002 13:21:42 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EA07537B404
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 13:21:41 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C069143E77
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 13:21:40 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g97KLeCo044861
	for <perforce@freebsd.org>; Mon, 7 Oct 2002 13:21:40 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g97KLeWX044851
	for perforce@freebsd.org; Mon, 7 Oct 2002 13:21:40 -0700 (PDT)
Date: Mon, 7 Oct 2002 13:21:40 -0700 (PDT)
Message-Id: <200210072021.g97KLeWX044851@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 18877 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18877

Change 18877 by green@green_laptop_2 on 2002/10/07 13:20:39

	Correct crashes related to not knowing what the correct minimum
	argc is.

Affected files ...

.. //depot/projects/trustedbsd/mac/usr.sbin/extattr/rmextattr.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac/usr.sbin/extattr/rmextattr.c#4 (text+ko) ====

@@ -102,7 +102,8 @@
 	char	*buf, *visbuf, *p;
 
 	const char *options, *attrname;
-	int	 buflen, visbuflen, ch, error, i, arg_counter, attrnamespace;
+	int	 buflen, visbuflen, ch, error, i, arg_counter, attrnamespace,
+		 minargc;
 
 	int	flag_force = 0;
 	int	flag_quiet = 0;
@@ -118,15 +119,19 @@
 	if (!strcmp(p, "getextattr")) {
 		what = EAGET;
 		options = "fqsx";
+		minargc = 3;
 	} else if (!strcmp(p, "setextattr")) {
 		what = EASET;
 		options = "fq";
+		minargc = 4;
 	} else if (!strcmp(p, "rmextattr")) {
 		what = EARM;
 		options = "fq";
+		minargc = 3;
 	} else if (!strcmp(p, "lsextattr")) {
 		what = EALS;
 		options = "fq";
+		minargc = 2;
 	} else {
 		usage();
 	}
@@ -154,7 +159,7 @@
 	argc -= optind;
 	argv += optind;
 
-	if (argc < 2)
+	if (argc < minargc)
 		usage();
 
 	error = extattr_string_to_namespace(argv[0], &attrnamespace);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message