diff options
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
-rw-r--r-- | epan/dissectors/packet-usb-hid.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 5cd4522e56..4fcee4ed72 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -3721,10 +3721,12 @@ dissect_usb_hid_get_report_descriptor(packet_info *pinfo _U_, proto_tree *parent tree = proto_item_add_subtree(item, ett_usb_hid_report); offset = dissect_usb_hid_report_item(pinfo, tree, tvb, offset, usb_conv_info, &initial_global); - data->usb_info = *usb_conv_info; - data->desc_length = offset - old_offset; - tvb_memdup(wmem_file_scope(), tvb, old_offset, data->desc_length); - insert_report_descriptor(pinfo, data); + if (usb_conv_info) { + data->usb_info = *usb_conv_info; + data->desc_length = offset - old_offset; + tvb_memdup(wmem_file_scope(), tvb, old_offset, data->desc_length); + insert_report_descriptor(pinfo, data); + } proto_item_set_len(item, offset-old_offset); |