X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/40bf885bd55a47f2cf4325fd53931a4c46793107..refs/heads/coverity_scan:/print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 38f80d9b..d997cbcd 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -729,8 +729,11 @@ tcp_print(netdissect_options *ndo,
                 nd_trunc_longjmp(ndo);
         }
         bp += header_len;
-        if ((flags & TH_RST) && ndo->ndo_vflag) {
-                print_tcp_rst_data(ndo, bp, length);
+        if (flags & TH_RST) {
+                if (ndo->ndo_vflag)
+                        print_tcp_rst_data(ndo, bp, length);
+                else
+                        ND_TCHECK_LEN(bp, length);
                 return;
         }
 
@@ -864,14 +867,13 @@ static void
 print_tcp_rst_data(netdissect_options *ndo,
                    const u_char *sp, u_int length)
 {
-        ND_PRINT(ND_TTEST_LEN(sp, length) ? " [RST" : " [!RST");
-        if (length > MAX_RST_DATA_LEN) {
-                length = MAX_RST_DATA_LEN;	/* can use -X for longer */
+        ND_PRINT(" [RST");
+        if (length > MAX_RST_DATA_LEN)		/* can use -X for longer */
                 ND_PRINT("+");			/* indicate we truncate */
-        }
         ND_PRINT(" ");
-        (void)nd_printn(ndo, sp, length, ndo->ndo_snapend);
+        nd_printjn(ndo, sp, ND_MIN(length, MAX_RST_DATA_LEN));
         ND_PRINT("]");
+        ND_TCHECK_LEN(sp, length);
 }
 
 static void