From owner-p4-projects@FreeBSD.ORG  Sat Jun  7 22:15:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A77201065679; Sat,  7 Jun 2008 22:15:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6966A106566C
	for <perforce@FreeBSD.org>; Sat,  7 Jun 2008 22:15:59 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EBD18FC0A
	for <perforce@FreeBSD.org>; Sat,  7 Jun 2008 22:15:59 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m57MFxXF080251
	for <perforce@FreeBSD.org>; Sat, 7 Jun 2008 22:15:59 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m57MFxEx080249
	for perforce@freebsd.org; Sat, 7 Jun 2008 22:15:59 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Sat, 7 Jun 2008 22:15:59 GMT
Message-Id: <200806072215.m57MFxEx080249@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143091 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, 07 Jun 2008 22:16:00 -0000

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

Change 143091 by rpaulo@rpaulo_epsilon on 2008/06/07 22:15:30

	Add error checking.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/Makefile#5 edit
.. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#5 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/Makefile#5 (text+ko) ====

@@ -1,8 +1,9 @@
-# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#4 $
+# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#5 $
 
 PROG=tcpad
 SRCS=main.c device.c linkhdr.c handler.c dumper.c
 CFLAGS+=-DDEBUG
+WARNS=5
 LDADD=-lpcap
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#4 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#5 $
  */
 
 #include <string.h>
@@ -43,6 +43,10 @@
 	struct dumppkt *dp;
 
 	dp = malloc(sizeof(*dp));
+	if (dp == NULL) {
+		fprintf(stderr, "%s: malloc failed\n", __func__);
+		return;
+	}
 	memcpy(&dp->pheader, ph, sizeof(struct pcap_pkthdr));
 	memcpy(&dp->headers, headers, sizeof(dp->headers));
 	/* XXX: honour the size of this list */
@@ -59,7 +63,11 @@
 	struct dumppkt *dp;
 
 	pd = pcap_dump_open(p, path);
+	if (pd == NULL) {
+		fprintf(stderr, "%s: %s\n", __func__, pcap_geterr(p));
+		return;
+	}
 	TAILQ_FOREACH(dp, head, entries)
-		pcap_dump((u_char *)pd, &dp->pheader, dp->headers);
+	    pcap_dump((u_char *)pd, &dp->pheader, dp->headers);
 	pcap_dump_close(pd);
 }