diff options
author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-09-28 00:11:01 +0000 |
---|---|---|
committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-09-28 00:11:01 +0000 |
commit | 310b0949e4d5ae40b534bfed715766119f1b969d (patch) | |
tree | 8bccfc0322e4b72b455501d1c9eb7129b704be0f /packet-smb.c | |
parent | 4a65bf0b0190136598905a558a7de85f41ae692e (diff) |
in ReadAndX
when reading what could potentially be the maxcount high field
assume that IF it is 0xFFFFFFFF that it is not maxcount high at all but
instead just some padding/reserved bytes.
If this field is 0xFFFFFFFF just ignore it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8559 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-smb.c')
-rw-r--r-- | packet-smb.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/packet-smb.c b/packet-smb.c index 1e205038a8..64763c9ca1 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.369 2003/08/28 22:51:07 guy Exp $ + * $Id: packet-smb.c,v 1.370 2003/09/28 00:11:01 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -5326,10 +5326,18 @@ dissect_read_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i * * Perhaps the 32-bit timeout field was hijacked as a 16-bit * high count and a 16-bit reserved field. + * + * XXX if maxcount high is 0xFFFFFFFF we assume it is just padding + * bytes and we just ignore it. */ /* Amasingly enough, this really is 4 bytes, according to the SNIA spec */ maxcnt_high = tvb_get_letohl(tvb, offset); - proto_tree_add_uint(tree, hf_smb_max_count_high, tvb, offset, 4, maxcnt_high); + if(maxcnt_high==0xffffffff){ + maxcnt_high=0; + } else { + proto_tree_add_uint(tree, hf_smb_max_count_high, tvb, offset, 4, maxcnt_high); + } + offset += 4; maxcnt=maxcnt_high; |