Module Name: src
Committed By: bouyer
Date: Thu Mar 26 20:20:21 UTC 2009
Modified Files:
src/dist/tcpdump [netbsd-3]: print-ppp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1994):
dist/tcpdump/print-ppp.c: revision 1.6
fix remote crash; from tiocsti.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/dist/tcpdump/print-ppp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/tcpdump/print-ppp.c
diff -u src/dist/tcpdump/print-ppp.c:1.5 src/dist/tcpdump/print-ppp.c:1.5.2.1
--- src/dist/tcpdump/print-ppp.c:1.5 Mon Sep 27 23:04:24 2004
+++ src/dist/tcpdump/print-ppp.c Thu Mar 26 20:20:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-ppp.c,v 1.5 2004/09/27 23:04:24 dyoung Exp $ */
+/* $NetBSD: print-ppp.c,v 1.5.2.1 2009/03/26 20:20:21 bouyer Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89.2.3 2004/03/24 03:32:43 guy Exp (LBL)";
#else
-__RCSID("$NetBSD: print-ppp.c,v 1.5 2004/09/27 23:04:24 dyoung Exp $");
+__RCSID("$NetBSD: print-ppp.c,v 1.5.2.1 2009/03/26 20:20:21 bouyer Exp $");
#endif
#endif
@@ -449,6 +449,11 @@
pfunc = NULL;
break;
}
+
+ /* bail if protocol was unknown */
+ if (pfunc == NULL)
+ break;
+
if ((j = (*pfunc)(tptr, len)) == 0)
break;
x -= j;