X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..de0c7fc746c37eb83e15a6890d30dc6f608e9d76:/smbutil.c

diff --git a/smbutil.c b/smbutil.c
index 8b4b9c69..38bd76de 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -132,7 +132,7 @@ name_interpret(netdissect_options *ndo,
 
     if (in >= maxbuf)
 	return(-1);	/* name goes past the end of the buffer */
-    ND_TCHECK2(*in, 1);
+    ND_TCHECK_1(in);
     len = EXTRACT_U_1(in) / 2;
     in++;
 
@@ -142,7 +142,7 @@ name_interpret(netdissect_options *ndo,
 	return(0);
 
     while (len--) {
-	ND_TCHECK2(*in, 2);
+	ND_TCHECK_2(in);
 	if (in + 1 >= maxbuf)
 	    return(-1);	/* name goes past the end of the buffer */
 	if (in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
@@ -175,7 +175,7 @@ name_ptr(netdissect_options *ndo,
     p = buf + ofs;
     if (p >= maxbuf)
 	return(NULL);	/* name goes past the end of the buffer */
-    ND_TCHECK2(*p, 1);
+    ND_TCHECK_1(p);
 
     c = *p;
 
@@ -183,7 +183,7 @@ name_ptr(netdissect_options *ndo,
     if ((c & 0xC0) == 0xC0) {
 	uint16_t l;
 
-	ND_TCHECK2(*p, 2);
+	ND_TCHECK_2(p);
 	if ((p + 1) >= maxbuf)
 	    return(NULL);	/* name goes past the end of the buffer */
 	l = EXTRACT_BE_U_2(p) & 0x3FFF;
@@ -194,7 +194,7 @@ name_ptr(netdissect_options *ndo,
 	p = buf + l;
 	if (p >= maxbuf)
 	    return(NULL);	/* name goes past the end of the buffer */
-	ND_TCHECK2(*p, 1);
+	ND_TCHECK_1(p);
     }
     return(p);
 
@@ -229,16 +229,16 @@ name_len(netdissect_options *ndo,
 
     if (s >= maxbuf)
 	return(-1);	/* name goes past the end of the buffer */
-    ND_TCHECK2(*s, 1);
+    ND_TCHECK_1(s);
     c = *s;
     if ((c & 0xC0) == 0xC0)
 	return(2);
     while (*s) {
 	if (s >= maxbuf)
 	    return(-1);	/* name goes past the end of the buffer */
-	ND_TCHECK2(*s, 1);
+	ND_TCHECK_1(s);
 	s += (*s) + 1;
-	ND_TCHECK2(*s, 1);
+	ND_TCHECK_1(s);
     }
     return(PTR_DIFF(s, s0) + 1);
 
@@ -374,7 +374,7 @@ unistr(netdissect_options *ndo,
 	    strsize = *len - 1;
 	} else {
 	    for (;;) {
-		ND_TCHECK2(sp[0], 2);
+		ND_TCHECK_2(sp);
 		*len += 2;
 		if (sp[0] == 0 && sp[1] == 0)
 		    break;
@@ -406,7 +406,7 @@ unistr(netdissect_options *ndo,
 	}
     } else {
 	while (strsize != 0) {
-	    ND_TCHECK2(s[0], 2);
+	    ND_TCHECK_2(s);
 	    if (l >= MAX_UNISTR_SIZE)
 		break;
 	    if (s[1] == 0 && ND_ISPRINT(s[0])) {
@@ -450,7 +450,7 @@ smb_fdata1(netdissect_options *ndo,
 	    break;
 
 	case 'A':
-	    ND_TCHECK2(buf[0], 2);
+	    ND_TCHECK_2(buf);
 	    write_bits(ndo, EXTRACT_LE_U_2(buf), attrib_fmt);
 	    buf += 2;
 	    fmt++;
@@ -504,7 +504,7 @@ smb_fdata1(netdissect_options *ndo,
 	case 'd':
 	  {
 	    unsigned int x;
-	    ND_TCHECK2(buf[0], 2);
+	    ND_TCHECK_2(buf);
 	    x = reverse ? EXTRACT_BE_U_2(buf) :
 			  EXTRACT_LE_U_2(buf);
 	    ND_PRINT((ndo, "%d (0x%x)", x, x));
@@ -515,7 +515,7 @@ smb_fdata1(netdissect_options *ndo,
 	case 'D':
 	  {
 	    unsigned int x;
-	    ND_TCHECK2(buf[0], 4);
+	    ND_TCHECK_4(buf);
 	    x = reverse ? EXTRACT_BE_U_4(buf) :
 			  EXTRACT_LE_U_4(buf);
 	    ND_PRINT((ndo, "%d (0x%x)", x, x));
@@ -526,7 +526,7 @@ smb_fdata1(netdissect_options *ndo,
 	case 'L':
 	  {
 	    uint64_t x;
-	    ND_TCHECK2(buf[0], 8);
+	    ND_TCHECK_8(buf);
 	    x = reverse ? EXTRACT_BE_U_8(buf) :
 			  EXTRACT_LE_U_8(buf);
 	    ND_PRINT((ndo, "%" PRIu64 " (0x%" PRIx64 ")", x, x));
@@ -539,7 +539,7 @@ smb_fdata1(netdissect_options *ndo,
 	    /* Weird mixed-endian length values in 64-bit locks */
 	    uint32_t x1, x2;
 	    uint64_t x;
-	    ND_TCHECK2(buf[0], 8);
+	    ND_TCHECK_8(buf);
 	    x1 = reverse ? EXTRACT_BE_U_4(buf) :
 			   EXTRACT_LE_U_4(buf);
 	    x2 = reverse ? EXTRACT_BE_U_4(buf + 4) :
@@ -563,7 +563,7 @@ smb_fdata1(netdissect_options *ndo,
 	case 'w':
 	  {
 	    unsigned int x;
-	    ND_TCHECK2(buf[0], 2);
+	    ND_TCHECK_2(buf);
 	    x = reverse ? EXTRACT_BE_U_2(buf) :
 			  EXTRACT_LE_U_2(buf);
 	    ND_PRINT((ndo, "0x%X", x));
@@ -574,7 +574,7 @@ smb_fdata1(netdissect_options *ndo,
 	case 'W':
 	  {
 	    unsigned int x;
-	    ND_TCHECK2(buf[0], 4);
+	    ND_TCHECK_4(buf);
 	    x = reverse ? EXTRACT_BE_U_4(buf) :
 			  EXTRACT_LE_U_4(buf);
 	    ND_PRINT((ndo, "0x%X", x));
@@ -595,7 +595,7 @@ smb_fdata1(netdissect_options *ndo,
 		break;
 
 	    case 'd':
-		ND_TCHECK2(buf[0], 2);
+		ND_TCHECK_2(buf);
 		stringlen = reverse ? EXTRACT_BE_U_2(buf) :
 				      EXTRACT_LE_U_2(buf);
 		ND_PRINT((ndo, "%u", stringlen));
@@ -603,7 +603,7 @@ smb_fdata1(netdissect_options *ndo,
 		break;
 
 	    case 'D':
-		ND_TCHECK2(buf[0], 4);
+		ND_TCHECK_4(buf);
 		stringlen = reverse ? EXTRACT_BE_U_4(buf) :
 				      EXTRACT_LE_U_4(buf);
 		ND_PRINT((ndo, "%u", stringlen));
@@ -637,7 +637,7 @@ smb_fdata1(netdissect_options *ndo,
 
 	    ND_TCHECK(*buf);
 	    if (*buf != 4 && *buf != 2) {
-		ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", *buf));
+		ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", EXTRACT_U_1(buf)));
 		return maxbuf;	/* give up */
 	    }
 	    len = 0;
@@ -736,7 +736,7 @@ smb_fdata1(netdissect_options *ndo,
 
 	    switch (atoi(fmt + 1)) {
 	    case 1:
-		ND_TCHECK2(buf[0], 4);
+		ND_TCHECK_4(buf);
 		x = EXTRACT_LE_U_4(buf);
 		if (x == 0 || x == 0xFFFFFFFF)
 		    t = 0;
@@ -745,7 +745,7 @@ smb_fdata1(netdissect_options *ndo,
 		buf += 4;
 		break;
 	    case 2:
-		ND_TCHECK2(buf[0], 4);
+		ND_TCHECK_4(buf);
 		x = EXTRACT_LE_U_4(buf);
 		if (x == 0 || x == 0xFFFFFFFF)
 		    t = 0;
@@ -754,7 +754,7 @@ smb_fdata1(netdissect_options *ndo,
 		buf += 4;
 		break;
 	    case 3:
-		ND_TCHECK2(buf[0], 8);
+		ND_TCHECK_8(buf);
 		t = interpret_long_date(buf);
 		buf += 8;
 		break;