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-masstorage.c | |
| parent | 5422134e86e9a86830f8184f0b045dd9824551c4 (diff) | |
Reject the packet if data is NULL.
svn path=/trunk/; revision=53889
Diffstat (limited to 'epan/dissectors/packet-usb-masstorage.c')
| -rw-r--r-- | epan/dissectors/packet-usb-masstorage.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 9afa7a7ecf..6849e4f35c 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -174,7 +174,7 @@ dissect_usb_ms_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void static int dissect_usb_ms_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; usb_ms_conv_info_t *usb_ms_conv_info; proto_tree *tree=NULL; guint32 signature=0; @@ -183,6 +183,11 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, itl_nexus_t *itl; itlq_nexus_t *itlq; + /* Reject the packet if data is NULL */ + if (data == NULL) + return 0; + usb_conv_info = (usb_conv_info_t *)data; + /* verify that we do have a usb_ms_conv_info */ usb_ms_conv_info=(usb_ms_conv_info_t *)usb_conv_info->class_data; if(!usb_ms_conv_info){ |