diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-03 19:33:23 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-03 19:33:23 +0000 |
| commit | 77b65a02440a35a46e595a3d0cacec719dbb5eef (patch) | |
| tree | a641dd8a423a68b8182ae471a83ebe44ec0bf1c8 /epan/dissectors/packet-smb.c | |
| parent | 7eda23cb322e3f22dfa523677d2ca72ca63def60 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4734 :
Don't crash on a malformed SMB packet. According to svn blame, this code
has been here since rev 21713 though maybe something else changed to make the
crash apparent.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32650 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 53d26b06b4..bbcf8b0be5 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -8222,8 +8222,9 @@ dissect_nt_trans_data_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pro case NT_TRANS_IOCTL: /* ioctl data */ ioctl_tvb=tvb_new_subset(tvb, offset, MIN((int)bc, tvb_length_remaining(tvb, offset)), bc); - dissect_smb2_ioctl_data(ioctl_tvb, pinfo, tree, top_tree_global, nti->ioctl_function, TRUE); - + if (nti){ + dissect_smb2_ioctl_data(ioctl_tvb, pinfo, tree, top_tree_global, nti->ioctl_function, TRUE); + } offset += bc; |