diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-28 09:44:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-28 09:44:27 +0000 |
| commit | ce66d97e35ffc7e5614f50a6f04b23e8c2b20364 (patch) | |
| tree | 99a68e904ec382ac769ffd80c0dcf32ca607d1b2 /packet-smb-mailslot.c | |
| parent | 56636f157abdc8472bcf43de4837d5af2058de16 (diff) | |
| download | wireshark-ce66d97e35ffc7e5614f50a6f04b23e8c2b20364.tar.gz wireshark-ce66d97e35ffc7e5614f50a6f04b23e8c2b20364.tar.bz2 wireshark-ce66d97e35ffc7e5614f50a6f04b23e8c2b20364.zip | |
Updates to transaction reassembly, from Ronnie Sahlberg.
Add some checks for null tvbuff arguments.
When dissecting transaction setup, parameters, and data when we couldn't
dissect it as a pipe or mailslot transaction, use the reported length of
the supplied tvbuff, not the actual length, as the amount of data
present.
svn path=/trunk/; revision=4291
Diffstat (limited to 'packet-smb-mailslot.c')
| -rw-r--r-- | packet-smb-mailslot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c index 9f62edaff6..2d8ce1fe85 100644 --- a/packet-smb-mailslot.c +++ b/packet-smb-mailslot.c @@ -2,7 +2,7 @@ * Routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-mailslot.c,v 1.26 2001/11/27 05:14:04 guy Exp $ + * $Id: packet-smb-mailslot.c,v 1.27 2001/11/28 09:44:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -173,7 +173,9 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, /* mailslot name */ len = tvb_strsize(mshdr_tvb, offset); proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, TRUE); + offset += len; } + proto_item_set_len(item, offset); dissected = FALSE; switch(trans_subcmd){ |