From owner-p4-projects  Fri Nov 22 10:26:51 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EA9637B404; Fri, 22 Nov 2002 10:26:49 -0800 (PST)
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 F0ADA37B401
	for <perforce@freebsd.org>; Fri, 22 Nov 2002 10:26:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9ABFA43EA3
	for <perforce@freebsd.org>; Fri, 22 Nov 2002 10:26:48 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMINYmV073834
	for <perforce@freebsd.org>; Fri, 22 Nov 2002 10:23:34 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMINXT2073831
	for perforce@freebsd.org; Fri, 22 Nov 2002 10:23:33 -0800 (PST)
Date: Fri, 22 Nov 2002 10:23:33 -0800 (PST)
Message-Id: <200211221823.gAMINXT2073831@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 21377 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://perforce.freebsd.org/chv.cgi?CH=21377

Change 21377 by green@green_laptop_2 on 2002/11/22 10:23:06

	Do the right thing for files that are not to be relabeled
	at all (not crash).

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#8 (text+ko) ====

@@ -454,6 +454,8 @@
 			 /* add length of "x\0"/"y," */
 			size += strlen(ls->match->mactext) + 1;
 	}
+	if (size == 0)
+		return (0);
 	macstr = malloc(size);
 	if (macstr == NULL)
 		err(1, "malloc");

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