From: hannes <hannes>
Date: Tue, 2 Mar 2004 07:38:10 +0000 (+0000)
Subject: From: alex medvedev <alexm@pycckue.org>
X-Git-Tag: tcpdump-3.9.1~465
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/544802f1839926d09f6d15743df54f206b6d7990

From: alex medvedev <alexm@pycckue.org>
catch a segfault:
  option 81 min size should be 4 bytes:
    http://sunsite.uakom.sk/doc/rfc/bootp-dhcp-option-81
---

diff --git a/print-bootp.c b/print-bootp.c
index 410bde37..cde86456 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.77 2003-11-16 09:36:15 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78 2004-03-02 07:38:10 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -556,6 +556,10 @@ rfc1048_print(register const u_char *bp)
 				break;
 
 			case TAG_CLIENT_FQDN:
+				/* option 81 should be at least 4 bytes long */
+				if (len < 4) 
+                                        printf("ERROR: options 81 len %u < 4 bytes", len);
+					break;
 				if (*bp++)
 					printf("[svrreg]");
 				if (*bp)