X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/00ecef01d7dd1f53c58ddeb0f906f3ec602283f0..50f375f9f1444e744d6e4b117940f0a7c9dd8c23:/print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index e45f2826..bdc66c64 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -69,11 +69,9 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_PRINT("MPLS");
 	do {
 		ND_TCHECK_LEN(p, sizeof(label_entry));
-		if (length < sizeof(label_entry)) {
-			ND_PRINT("[|MPLS], length %u", length);
-			return;
-		}
-		label_entry = EXTRACT_BE_U_4(p);
+		if (length < sizeof(label_entry))
+			goto trunc;
+		label_entry = GET_BE_U_4(p);
 		ND_PRINT("%s(label %u",
 		       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
        		       MPLS_LABEL(label_entry));
@@ -135,7 +133,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			/* nothing to print */
 			return;
 		}
-		switch(EXTRACT_U_1(p)) {
+		switch(GET_U_1(p)) {
 
 		case 0x45:
 		case 0x46: