X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d87f746286cc75b1dc96cfce122c2e78fe0ac9cb..ad87e9495c5c5ecdbb38b7ad76e9c54d7e9852ac:/print-bootp.c diff --git a/print-bootp.c b/print-bootp.c index ce1f9c6c..d1534c7a 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -21,8 +21,8 @@ * Format and print bootp packets. */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.74 2003-07-01 19:16:06 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.79 2005-04-20 10:30:52 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -141,7 +141,7 @@ bootp_print(register const u_char *cp, u_int length) } putchar('"'); } - TCHECK2(bp->bp_sname[0], 1); /* check first char only */ + TCHECK2(bp->bp_file[0], 1); /* check first char only */ if (*bp->bp_file) { printf("\n\t file \""); if (fn_print(bp->bp_file, snapend)) { @@ -556,6 +556,11 @@ 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)