X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4aac37f04316b37b73b99bdcdbfa97347bb2fe51..8a33158e8896bcc38ceccf2d52c11af84dbfb971:/print-smb.c

diff --git a/print-smb.c b/print-smb.c
index 402bb71f..77d9f814 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -952,7 +952,7 @@ nbt_tcp_print(netdissect_options *ndo,
 	goto trunc;
     if (ndo->ndo_snapend < data)
 	goto trunc;
-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);
     if (caplen < 4)
 	goto trunc;
     maxbuf = data + caplen;
@@ -1237,7 +1237,7 @@ nbt_udp137_print(netdissect_options *ndo,
 		} else {
 		    if (p >= maxbuf)
 		        goto out;
-		    smb_data_print(ndo, p, min(rdlen, length - (p - data)));
+		    smb_data_print(ndo, p, min(rdlen, length - ND_BYTES_BETWEEN(p, data)));
 		    p += rdlen;
 		}
 	    }
@@ -1269,7 +1269,7 @@ smb_tcp_print(netdissect_options *ndo,
 	goto trunc;
     if (ndo->ndo_snapend < data)
 	goto trunc;
-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);
     if (caplen < 4)
 	goto trunc;
     maxbuf = data + caplen;