diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-12-17 10:09:40 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-12-17 10:09:40 +0000 |
| commit | c0a8829bfd235bab3f48bb0a62867d27803a55e3 (patch) | |
| tree | 0bb9e7792a0216a3e2858533e5f4bede59f6b4f3 /epan/dissectors/packet-usb.c | |
| parent | c04cd4c91c5dff8f294e2e3e2ceb69a31fe1613a (diff) | |
| download | wireshark-c0a8829bfd235bab3f48bb0a62867d27803a55e3.tar.gz | |
Display the CONTROL response data only if there *is* CONTROL response data.
svn path=/trunk/; revision=27034
Diffstat (limited to 'epan/dissectors/packet-usb.c')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index aedf8d0730..f122b53175 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1610,14 +1610,18 @@ dissect_linux_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent) if(dissector){ offset = dissector(pinfo, tree, tvb, offset, is_request, usb_conv_info->usb_trans_info, usb_conv_info); } else { - proto_tree_add_text(tree, tvb, offset, -1, "CONTROL response data"); - offset += tvb_length_remaining(tvb, offset); + if (tvb_reported_length_remaining(tvb, offset) != 0) { + proto_tree_add_text(tree, tvb, offset, -1, "CONTROL response data"); + offset += tvb_length_remaining(tvb, offset); + } } } } else { /* no matching request available */ - proto_tree_add_text(tree, tvb, offset, -1, "CONTROL response data"); - offset += tvb_length_remaining(tvb, offset); + if (tvb_reported_length_remaining(tvb, offset) != 0) { + proto_tree_add_text(tree, tvb, offset, -1, "CONTROL response data"); + offset += tvb_length_remaining(tvb, offset); + } } } } |