From owner-p4-projects@FreeBSD.ORG  Sat Jan 21 14:08:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 958B216A423; Sat, 21 Jan 2006 14:08:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 54CD816A41F
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:08:04 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA18E43D58
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:08:03 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LE8318083229
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:08:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LE83H1083226
	for perforce@freebsd.org; Sat, 21 Jan 2006 14:08:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 21 Jan 2006 14:08:03 GMT
Message-Id: <200601211408.k0LE83H1083226@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90083 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sat, 21 Jan 2006 14:08:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=90083

Change 90083 by rwatson@rwatson_sesame on 2006/01/21 14:07:04

	Add an assert to help FlexeLint figure out GET_TOKEN_AREA().  phk
	and I can't see the bug in the macro that causes FlexeLint to get
	unhappy, which doesn't mean it doesn't exist, just that it's got
	us stumped, so the assert helps FlexeLint figure out what we
	meant (and maybe said).

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#29 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#29 (text+ko) ====

@@ -47,6 +47,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
@@ -67,6 +68,7 @@
 		} else							\
 			memset(dptr, 0, (length));			\
 	}								\
+	assert(t == NULL || dptr != NULL);				\
 } while (0)
 
 /*