aboutsummaryrefslogtreecommitdiffstats
path: root/packet-smb.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-11-12 08:58:05 +0000
committerGuy Harris <guy@alum.mit.edu>2003-11-12 08:58:05 +0000
commitacb0b8885ff854e7cccd585300f9d23ddccb658a (patch)
tree3ac2b1c896a569525e21660d0402f8eea7b07a55 /packet-smb.c
parentf0887775c21a66e7f8e629c0377b5ad324f46558 (diff)
If what remains of the SMB byte count exceeds the data left in the
tvbuff, show what's left as extra byte parameters - don't act as if there aren't any extra byte parameters. svn path=/trunk/; revision=8946
Diffstat (limited to 'packet-smb.c')
-rw-r--r--packet-smb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/packet-smb.c b/packet-smb.c
index 7544927038..ce5d61aaf8 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.375 2003/11/10 08:02:33 sahlberg Exp $
+ * $Id: packet-smb.c,v 1.376 2003/11/12 08:58:05 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -773,9 +773,7 @@ static int dissect_smb_command(tvbuff_t *tvb, packet_info *pinfo, int offset, pr
gint bc_remaining; \
bc_remaining=tvb_length_remaining(tvb, offset); \
if( ((gint)bc) > bc_remaining){ \
- bc=0; \
- } else { \
- bc=(guint16)bc_remaining; \
+ bc=bc_remaining; \
} \
if(bc){ \
proto_tree_add_text(tree, tvb, offset, bc, \