diff options
author | Martin Kaiser <wireshark@kaiser.cx> | 2014-06-10 23:56:23 +0200 |
---|---|---|
committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-06-14 14:08:33 +0000 |
commit | a1a5f6513d8a815ffee0a784d030d1dd0d45d48c (patch) | |
tree | a9ba130c4a95d02f83a73ebaafb6823b047cc751 | |
parent | 548d8aaf6c35a78da01cc60e69a9b2c0f4185266 (diff) | |
download | wireshark-a1a5f6513d8a815ffee0a784d030d1dd0d45d48c.tar.gz wireshark-a1a5f6513d8a815ffee0a784d030d1dd0d45d48c.tar.bz2 wireshark-a1a5f6513d8a815ffee0a784d030d1dd0d45d48c.zip |
limit the scope of setup_tvb
Change-Id: Id3fc3f017c02c2df3b0578c28f187b106c3ad2ed
Reviewed-on: https://code.wireshark.org/review/2218
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-rw-r--r-- | epan/dissectors/packet-usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 0fd9e6ee66..457c1a5394 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2922,7 +2922,6 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, conversation_t *conversation; guint16 device_address; tvbuff_t *next_tvb = NULL; - tvbuff_t *setup_tvb = NULL; device_product_data_t *device_product_data = NULL; device_protocol_data_t *device_protocol_data = NULL; wmem_tree_key_t key[4]; @@ -3011,6 +3010,8 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, } if (usb_conv_info->is_request) { + tvbuff_t *setup_tvb = NULL; + if (usb_conv_info->is_setup) { /* this is a request */ |