From owner-p4-projects@FreeBSD.ORG  Sat Jun  2 21:49:41 2007
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 29F8916A46B; Sat,  2 Jun 2007 21:49:41 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 F34B616A468
	for <perforce@FreeBSD.org>; Sat,  2 Jun 2007 21:49:40 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E4E0413C44C
	for <perforce@FreeBSD.org>; Sat,  2 Jun 2007 21:49:40 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52LneCd067078
	for <perforce@FreeBSD.org>; Sat, 2 Jun 2007 21:49:40 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52LneTc067072
	for perforce@freebsd.org; Sat, 2 Jun 2007 21:49:40 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 2 Jun 2007 21:49:40 GMT
Message-Id: <200706022149.l52LneTc067072@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 120802 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, 02 Jun 2007 21:49:41 -0000

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

Change 120802 by fli@fli_genesis on 2007/06/02 21:48:49

	- Remove incorrect assertion.
	- Check return value from mdns_buf_alloc() 

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#6 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#6 (text+ko) ====

@@ -233,7 +233,6 @@
 	struct mdns_bufhead bh2;
 
 	MDNS_INIT_ASSERT(bp, bp_magic);
-	MDNS_INIT_ASSERT(buf, b_magic);
 
 	if (MDNS_BUFHSZ(bh) <= 1)
 		return (TAILQ_FIRST(&bh->bh_list));
@@ -248,6 +247,8 @@
 
 	bzero(&bh2, sizeof(struct mdns_bufhead));
 	buf = mdns_buf_alloc(bp, &bh2, len, 1);
+	if (buf == NULL)
+		return (NULL);
 
 	while (!TAILQ_EMPTY(&bh->bh_list)) {
 		buf2 = TAILQ_FIRST(&bh->bh_list);