X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4166458a2a6c4b779bc238ee3d2e555cee1bc416..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index 76964436..6ad7c718 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -118,20 +118,20 @@ mobility_opt_print(netdissect_options *ndo,
 	unsigned i, optlen;
 
 	for (i = 0; i < len; i += optlen) {
-		ND_TCHECK(bp[i]);
+		ND_TCHECK_1(bp + i);
 		if (EXTRACT_U_1(bp + i) == IP6MOPT_PAD1)
 			optlen = 1;
 		else {
 			if (i + 1 < len) {
-				ND_TCHECK(bp[i + 1]);
-				optlen = bp[i + 1] + 2;
+				ND_TCHECK_1(bp + i + 1);
+				optlen = EXTRACT_U_1(bp + i + 1) + 2;
 			}
 			else
 				goto trunc;
 		}
 		if (i + optlen > len)
 			goto trunc;
-		ND_TCHECK(bp[i + optlen]);
+		ND_TCHECK_1(bp + i + optlen);
 
 		switch (EXTRACT_U_1(bp + i)) {
 		case IP6MOPT_PAD1: