#include <stdlib.h>
#include <string.h>
+#include "netdissect-ctype.h"
+
#include "netdissect.h"
#include "extract.h"
#include "smb.h"
if (in >= maxbuf)
return(-1); /* name goes past the end of the buffer */
- ND_TCHECK_1(in);
len = GET_U_1(in) / 2;
in++;
p = buf + ofs;
if (p >= maxbuf)
return(NULL); /* name goes past the end of the buffer */
- ND_TCHECK_1(p);
c = GET_U_1(p);
if (s >= maxbuf)
return(-1); /* name goes past the end of the buffer */
- ND_TCHECK_1(s);
c = GET_U_1(s);
if ((c & 0xC0) == 0xC0)
return(2);
while (GET_U_1(s)) {
if (s >= maxbuf)
return(-1); /* name goes past the end of the buffer */
- ND_TCHECK_1(s);
s += GET_U_1(s) + 1;
ND_TCHECK_1(s);
}
return;
ND_PRINT("[%03X] ", i);
for (i = 0; i < len; /*nothing*/) {
- ND_TCHECK_1(buf + i);
ND_PRINT("%02X ", GET_U_1(buf + i) & 0xff);
i++;
if (i%8 == 0)
while (n--)
ND_PRINT(" ");
- n = min(8, i % 16);
+ n = ND_MIN(8, i % 16);
print_asc(ndo, buf + i - (i % 16), n);
ND_PRINT(" ");
n = (i % 16) - n;
print_asc(ndo, buf + i - n, n);
ND_PRINT("\n");
}
- return;
-
-trunc:
- nd_print_trunc(ndo);
}
sp = s;
if (!use_unicode) {
for (;;) {
- ND_TCHECK_1(sp);
c = GET_U_1(sp);
sp++;
strsize++;
}
} else {
for (;;) {
- ND_TCHECK_2(sp);
c = GET_LE_U_2(sp);
sp += 2;
strsize += 2;
}
if (!use_unicode) {
while (strsize != 0) {
- ND_TCHECK_1(s);
c = GET_U_1(s);
s++;
strsize--;
break;
}
if (l < MAX_UNISTR_SIZE) {
- if (ND_ISPRINT(c)) {
+ if (ND_ASCII_ISPRINT(c)) {
/* It's a printable ASCII character */
- (*buf)[l] = c;
+ (*buf)[l] = (char)c;
} else {
/* It's a non-ASCII character or a non-printable ASCII character */
(*buf)[l] = '.';
}
} else {
while (strsize > 1) {
- ND_TCHECK_2(s);
c = GET_LE_U_2(s);
s += 2;
strsize -= 2;
break;
}
if (l < MAX_UNISTR_SIZE) {
- if (ND_ISPRINT(c)) {
+ if (ND_ASCII_ISPRINT(c)) {
/* It's a printable ASCII character */
- (*buf)[l] = c;
+ (*buf)[l] = (char)c;
} else {
/* It's a non-ASCII character or a non-printable ASCII character */
(*buf)[l] = '.';
while (*fmt && buf<maxbuf) {
switch (*fmt) {
case 'a':
- ND_TCHECK_1(buf);
write_bits(ndo, GET_U_1(buf), attrib_fmt);
buf++;
fmt++;
break;
case 'A':
- ND_TCHECK_2(buf);
write_bits(ndo, GET_LE_U_2(buf), attrib_fmt);
buf += 2;
fmt++;
strncpy(bitfmt, fmt, l);
bitfmt[l] = '\0';
fmt = p + 1;
- ND_TCHECK_1(buf);
write_bits(ndo, GET_U_1(buf), bitfmt);
buf++;
break;
ND_TCHECK_LEN(buf, l);
buf += l;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
case 'b':
{
unsigned int x;
- ND_TCHECK_1(buf);
x = GET_U_1(buf);
ND_PRINT("%u (0x%x)", x, x);
buf += 1;
case 'd':
{
int x;
- ND_TCHECK_2(buf);
x = reverse ? GET_BE_S_2(buf) :
GET_LE_S_2(buf);
ND_PRINT("%d (0x%x)", x, x);
case 'D':
{
int x;
- ND_TCHECK_4(buf);
x = reverse ? GET_BE_S_4(buf) :
GET_LE_S_4(buf);
ND_PRINT("%d (0x%x)", x, x);
case 'L':
{
uint64_t x;
- ND_TCHECK_8(buf);
x = reverse ? GET_BE_U_8(buf) :
GET_LE_U_8(buf);
ND_PRINT("%" PRIu64 " (0x%" PRIx64 ")", x, x);
case 'u':
{
unsigned int x;
- ND_TCHECK_2(buf);
x = reverse ? GET_BE_U_2(buf) :
GET_LE_U_2(buf);
ND_PRINT("%u (0x%x)", x, x);
case 'U':
{
unsigned int x;
- ND_TCHECK_4(buf);
x = reverse ? GET_BE_U_4(buf) :
GET_LE_U_4(buf);
ND_PRINT("%u (0x%x)", x, x);
case 'B':
{
unsigned int x;
- ND_TCHECK_1(buf);
x = GET_U_1(buf);
ND_PRINT("0x%X", x);
buf += 1;
case 'w':
{
unsigned int x;
- ND_TCHECK_2(buf);
x = reverse ? GET_BE_U_2(buf) :
GET_LE_U_2(buf);
ND_PRINT("0x%X", x);
case 'W':
{
unsigned int x;
- ND_TCHECK_4(buf);
x = reverse ? GET_BE_U_4(buf) :
GET_LE_U_4(buf);
ND_PRINT("0x%X", x);
switch (*fmt) {
case 'b':
- ND_TCHECK_1(buf);
stringlen = GET_U_1(buf);
stringlen_is_set = 1;
ND_PRINT("%u", stringlen);
case 'd':
case 'u':
- ND_TCHECK_2(buf);
stringlen = reverse ? GET_BE_U_2(buf) :
GET_LE_U_2(buf);
stringlen_is_set = 1;
case 'D':
case 'U':
- ND_TCHECK_4(buf);
stringlen = reverse ? GET_BE_U_4(buf) :
GET_LE_U_4(buf);
stringlen_is_set = 1;
case 'Z':
case 'Y': /* like 'Z', but always ASCII */
{
- ND_TCHECK_1(buf);
if (GET_U_1(buf) != 4 && GET_U_1(buf) != 2) {
ND_PRINT("Error! ASCIIZ buffer of type %u", GET_U_1(buf));
return maxbuf; /* give up */
ND_PRINT("%-*.*s", l, l, buf);
buf += l;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
ND_PRINT("%-*.*s", (int)stringlen, (int)stringlen, buf);
buf += stringlen;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
buf++;
}
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
name_type_str(name_type));
break;
case 2:
- ND_TCHECK_1(buf + 15);
name_type = GET_U_1(buf + 15);
ND_PRINT("%-15.15s NameType=0x%02X (%s)", buf, name_type,
name_type_str(name_type));
break;
}
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
switch (atoi(fmt + 1)) {
case 1:
- ND_TCHECK_4(buf);
x = GET_LE_U_4(buf);
if (x == 0 || x == 0xFFFFFFFF)
t = 0;
buf += 4;
break;
case 2:
- ND_TCHECK_4(buf);
x = GET_LE_U_4(buf);
if (x == 0 || x == 0xFFFFFFFF)
t = 0;
tstring = "NULL\n";
ND_PRINT("%s", tstring);
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
while (*fmt) {
switch (*fmt) {
case '*':
+ /*
+ * List of multiple instances of something described by the
+ * remainder of the string (which may itself include a list
+ * of multiple instances of something, so we recurse).
+ */
fmt++;
while (buf < maxbuf) {
const u_char *buf2;
depth++;
- buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
+ /*
+ * In order to avoid stack exhaustion recurse at most 10
+ * levels; that "should not happen", as no SMB structure
+ * should be nested *that* deeply, and we thus shouldn't
+ * have format strings with that level of nesting.
+ */
+ if (depth == 10) {
+ ND_PRINT("(too many nested levels, not recursing)");
+ buf2 = buf;
+ } else
+ buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
depth--;
if (buf2 == NULL)
return(NULL);
return(buf);
case '|':
+ /*
+ * Just do a bounds check.
+ */
fmt++;
if (buf >= maxbuf)
return(buf);
break;
case '%':
+ /*
+ * XXX - unused?
+ */
fmt++;
buf = maxbuf;
break;
case '#':
+ /*
+ * Done?
+ */
fmt++;
return(buf);
break;
case '[':
+ /*
+ * Format of an item, enclosed in square brackets; dissect
+ * the item with smb_fdata1().
+ */
fmt++;
if (buf >= maxbuf)
return(buf);
break;
default:
+ /*
+ * Not a formatting character, so just print it.
+ */
ND_PRINT("%c", *fmt);
fmt++;
break;
const err_code_struct *err = err_classes[i].err_msgs;
for (j = 0; err[j].name; j++)
if (num == err[j].code) {
- nd_snprintf(ret, sizeof(ret), "%s - %s (%s)",
+ snprintf(ret, sizeof(ret), "%s - %s (%s)",
err_classes[i].class, err[j].name, err[j].message);
return ret;
}
}
- nd_snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
+ snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
return ret;
}
- nd_snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
+ snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
return(ret);
}
return nt_errors[i].name;
}
- nd_snprintf(ret, sizeof(ret), "0x%08x", err);
+ snprintf(ret, sizeof(ret), "0x%08x", err);
return ret;
}
projects / tcpdump / blobdiff