diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-04 15:54:19 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-04 15:54:19 +0000 |
| commit | df9a7a0b1cda5d209597ad1990f6434ccb4c56a4 (patch) | |
| tree | 89060a09e7dd5f1eb6c4b9e2e5b7fc73758bd899 /epan/dissectors/packet-rdp.c | |
| parent | 6c902761a8ca5445b06c1e62f4436b76ccb40e35 (diff) | |
Fix CID 1287: rdp_info can't be NULL here so there's no need to check for it
being NULL.
svn path=/trunk/; revision=41929
Diffstat (limited to 'epan/dissectors/packet-rdp.c')
| -rw-r--r-- | epan/dissectors/packet-rdp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 09b1706b16..5857a50322 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1908,13 +1908,11 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { next_tree = proto_item_add_subtree(next_tree->last_child, ett_rdp_channelIdArray); for(i = 0; i < channelCount; i++) { offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, channel_fields); - if(rdp_info) { - if(i < MAX_CHANNELS) - rdp_info->channels[i].value = channelId; + if(i < MAX_CHANNELS) + rdp_info->channels[i].value = channelId; - /* register SendData on this for now */ - register_t124_sd_dissector(pinfo, channelId, dissect_rdp_SendData, proto_rdp); - } + /* register SendData on this for now */ + register_t124_sd_dissector(pinfo, channelId, dissect_rdp_SendData, proto_rdp); } if(channelCount % 2) offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, pad_fields); |