From owner-p4-projects@FreeBSD.ORG  Thu Oct 20 20:33:52 2005
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 43C5D16A422; Thu, 20 Oct 2005 20:33:52 +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 05D9E16A420
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:33:52 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CAAB443D5A
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:33:51 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9KKXper024174
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:33:51 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9KKXpIs024171
	for perforce@freebsd.org; Thu, 20 Oct 2005 20:33:51 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 20 Oct 2005 20:33:51 GMT
Message-Id: <200510202033.j9KKXpIs024171@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85616 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: Thu, 20 Oct 2005 20:33:53 -0000

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

Change 85616 by millert@millert_ibook on 2005/10/20 20:33:28

	Don't deref NULL pointer in sebsd_ss_malloc() if sebsd_malloc()
	returns NULL.  Style nits in sebsd_ss_malloc() and sebsd_ss_free().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#9 (text+ko) ====

@@ -111,21 +111,27 @@
 
 #ifdef __APPLE__
 
-void *sebsd_ss_malloc (size_t size, int flags)
+void *
+sebsd_ss_malloc(size_t size, int flags)
 {
-  size += sizeof(size_t);
-  size_t *v = sebsd_malloc (size, flags);
-  v[0] = size;
-  return v+1;
+	size_t *vs;
+
+	size += sizeof(size_t);
+	if ((vs = sebsd_malloc(size, flags)) != NULL)
+		*vs++ = size;
+	return (vs);
 }
 
-void sebsd_ss_free (void *v)
+void
+sebsd_ss_free(void *v)
 {
-  if (v == NULL)
-    return;
+	size_t *vs = (size_t *)v;
+
+	if (vs == NULL)
+		return;
 
-  size_t *vs = (size_t *) v;
-  sebsd_free (vs-1, vs[-1]);
+	/* size of region is stored immediately before v */
+	sebsd_free(vs - 1, vs[-1]);
 }
 
 #else