summaryrefslogtreecommitdiff
path: root/print-pgm.c
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-08-10 16:22:37 +0200
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-09-05 14:59:21 +0200
commit929e4be621ebdcede37865a5767a175f083f9138 (patch)
treebf6ecbc038696e66176b2d50e04e015767f23b3d /print-pgm.c
parent54b5db3dde658894be730b15480f9b6e27b717a0 (diff)
downloadtcpdump-test-rc.tar.gz
Remove many (761) redundant ND_TCHECK_n() callstest-rc
ND_TCHECK_n(e), n in { 1, 2, 3, 4, 8 }. They are redundant because they are followed by a GET_.*_n(e) call, same n, same e, which do the bounds check. Remove unused 'trunc' labels and most associated codes. Update the outputs of some tests accordingly.
Diffstat (limited to 'print-pgm.c')
-rw-r--r--print-pgm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/print-pgm.c b/print-pgm.c
index 00e53b82..0f88db6d 100644
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -364,7 +364,6 @@ pgm_print(netdissect_options *ndo,
* and stopping if we don't have enough.
*/
bp += (2 * sizeof(uint16_t));
- ND_TCHECK_2(bp);
switch (GET_BE_U_2(bp)) {
case AFNUM_INET:
ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
@@ -515,7 +514,6 @@ pgm_print(netdissect_options *ndo,
ND_PRINT("[Option length not a multiple of 4]");
return;
}
- ND_TCHECK_4(bp);
ND_PRINT(" %u", GET_BE_U_4(bp));
bp += 4;
opt_len -= 4;