aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-05-12 18:43:30 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-05-12 17:59:15 +0000
commit2e7ec36cd85649358f01c3019011251e759de9d4 (patch)
treed7aeac12cc6d558b4942c393fe9b420cae0fe44a /epan/dissectors/packet-usb.c
parent8de774af16980d70553c2e8a8dbe161d7cbf4a41 (diff)
USB: allow to call sub dissectors for setup response packets without transaction available
This is useful when people export displayed packets of a USB sub dissector (like MBIM) without keeping the USB setup requests and still expect to have "Decode As" functionality working Change-Id: Iad32ddc7b87544ff568a091f03e393a106f38554 Reviewed-on: https://code.wireshark.org/review/8430 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb.c')
-rw-r--r--epan/dissectors/packet-usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 25db658802..01f6a1136c 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -2899,8 +2899,8 @@ dissect_usb_setup_response(packet_info *pinfo, proto_tree *tree,
parent = proto_tree_get_parent_tree(tree);
- if (usb_conv_info && usb_conv_info->usb_trans_info) {
- if (is_usb_standard_setup_request(usb_conv_info->usb_trans_info)) {
+ if (usb_conv_info) {
+ if (usb_conv_info->usb_trans_info && is_usb_standard_setup_request(usb_conv_info->usb_trans_info)) {
offset = dissect_usb_standard_setup_response(pinfo, parent, tvb, offset, usb_conv_info);
}
else {