diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
| commit | 1166f90fe87cef69f7923a1b8c386eecdc6cb92b (patch) | |
| tree | 87e350d89f0c352cd41839a49086d78bf700350e /contrib/tcpdump/smbutil.c | |
| parent | a6836add6eafd2d06f4eeb7200e8217ba3399c1b (diff) | |
| download | FreeBSD-src-1166f90fe87cef69f7923a1b8c386eecdc6cb92b.zip FreeBSD-src-1166f90fe87cef69f7923a1b8c386eecdc6cb92b.tar.gz | |
Virgin import of tcpdump v3.9.1 (release) from tcpdump.org
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/smbutil.c')
| -rw-r--r-- | contrib/tcpdump/smbutil.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/tcpdump/smbutil.c b/contrib/tcpdump/smbutil.c index b7875f5..b3d4b5f 100644 --- a/contrib/tcpdump/smbutil.c +++ b/contrib/tcpdump/smbutil.c @@ -12,7 +12,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.36 2005/01/29 10:37:02 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.36.2.1 2005/04/21 04:09:58 guy Exp $"; #endif #include <tcpdump-stdinc.h> @@ -428,7 +428,6 @@ smb_fdata1(const u_char *buf, const char *fmt, const u_char *maxbuf, { int reverse = 0; const char *attrib_fmt = "READONLY|HIDDEN|SYSTEM|VOLUME|DIR|ARCHIVE|"; - int len; while (*fmt && buf<maxbuf) { switch (*fmt) { @@ -608,6 +607,8 @@ smb_fdata1(const u_char *buf, const char *fmt, const u_char *maxbuf, { /*XXX unistr() */ const char *s; + u_int32_t len; + len = 0; s = unistr(buf, &len, (*fmt == 'R') ? 0 : unicodestr); if (s == NULL) @@ -621,6 +622,8 @@ smb_fdata1(const u_char *buf, const char *fmt, const u_char *maxbuf, case 'Y': /* like 'Z', but always ASCII */ { const char *s; + u_int32_t len; + TCHECK(*buf); if (*buf != 4 && *buf != 2) { printf("Error! ASCIIZ buffer of type %u", *buf); |
