diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-09 20:55:49 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-09 20:55:49 +0000 |
| commit | cdd716e32fc42706221015151a848ccdcf1988f7 (patch) | |
| tree | 18eab86f42d961e0af34b10e6788b95d587c4198 /epan/dissectors/packet-usb-audio.c | |
| parent | 5422134e86e9a86830f8184f0b045dd9824551c4 (diff) | |
Reject the packet if data is NULL.
svn path=/trunk/; revision=53889
Diffstat (limited to 'epan/dissectors/packet-usb-audio.c')
| -rw-r--r-- | epan/dissectors/packet-usb-audio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 54ca0ca493..0f1cf4ee41 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -278,11 +278,17 @@ dissect_usb_audio_descriptor(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_usb_audio_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data) { - usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; + usb_conv_info_t *usb_conv_info; proto_tree *tree = NULL; guint offset; guint length = tvb_length(tvb); + + /* Reject the packet if data is NULL */ + if (data == NULL) + return 0; + usb_conv_info = (usb_conv_info_t *)data; + col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBAUDIO"); if (parent_tree) |