CVE-2017-13040/MPTCP: Clean up printing DSS suboption.

[tcpdump] / print-lldp.c

diff --git a/print-lldp.c b/print-lldp.c
index dfdf1b94aa541c23d3e6d7a49d3afd89f6c347e0..add7e6a5f94133645ac7b880dbe80e69f8ff7b25 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -927,7 +927,7 @@ lldp_extract_latlon(const u_char *tptr)
  * (right now there is only one)
  */
 
- 
+
 static int
 lldp_private_iana_print(netdissect_options *ndo,
                         const u_char *tptr, u_int tlv_len)
@@ -951,12 +951,12 @@ lldp_private_iana_print(netdissect_options *ndo,
     default:
         hexdump=TRUE;
     }
-    
+
     return hexdump;
 }
 
 
-      
+
 /*
  * Print private TIA extensions.
  */
@@ -1401,7 +1401,7 @@ lldp_mgmt_addr_tlv_print(netdissect_options *ndo,
     if (tlen) {
         oid_len = *tptr;
 
-        if (tlen < oid_len) {
+        if (tlen < 1U + oid_len) {
             return 0;
         }
         if (oid_len) {