aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-smb.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-09 02:42:58 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-09 02:42:58 +0000
commit77876124cfeb4d4e879816d13bcb5ce56ebb130d (patch)
treef19169aeff745be742081d49255f3cda3e6fdb80 /epan/dissectors/packet-smb.c
parent483d26d734da16e90708edc87261895983cdd6e3 (diff)
Count padding bytes against the transaction data byte count.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37022 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-smb.c')
-rw-r--r--epan/dissectors/packet-smb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index a1dfc8229e..efe9f937a4 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -14536,6 +14536,7 @@ dissect_4_3_4_8(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
smb_info_t *si = pinfo->private_data;
const char *fn;
int fn_len;
+ int pad;
DISSECTOR_ASSERT(si);
@@ -14626,8 +14627,10 @@ dissect_4_3_4_8(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
/* Pad to 4 bytes */
- if (offset % 4)
- offset += 4 - (offset % 4);
+ if (offset % 4) {
+ pad = 4 - (offset % 4);
+ COUNT_BYTES_SUBR(pad);
+ }
*trunc = FALSE;
return offset;