diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-20 09:07:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-20 09:07:34 +0000 |
| commit | 8550cfcc6f3f2fcbd9b9151083aa4e1bfa91755b (patch) | |
| tree | a22ff83ee5db1e222f81b6af426446d018936142 /packet-smb-pipe.c | |
| parent | 3c11e4ff6d10d6adfaa3f9c56b5993e5f381e8c1 (diff) | |
Allow the tvbuff pointer to various "proto_tree_add" routines to be null
if (and only if) the length of the item being added is 0 (so that it has
no data backing it).
This means the data stream name pointer for the item in question is
null; make sure we handle that.
Use that for some "uses the value from the matching request" fields in
the SMB Pipe protocol.
svn path=/trunk/; revision=4231
Diffstat (limited to 'packet-smb-pipe.c')
| -rw-r--r-- | packet-smb-pipe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index 33a57b9981..fc4547e0d6 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.50 2001/11/20 07:47:41 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.51 2001/11/20 09:07:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2716,7 +2716,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, */ if (tri != NULL && tri->function != -1) { function = tri->function; - proto_tree_add_uint(pipe_tree, hf_pipe_function, sp_tvb, + proto_tree_add_uint(pipe_tree, hf_pipe_function, NULL, 0, 0, function); if (check_col(pinfo->fd, COL_INFO)) { col_add_fstr(pinfo->fd, COL_INFO, "%s %s", @@ -2725,7 +2725,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, } fid = tri->fid; if (fid != -1) - add_fid(sp_tvb, pinfo, pipe_tree, 0, 0, fid); + add_fid(NULL, pinfo, pipe_tree, 0, 0, fid); } else { function = -1; fid = -1; |