aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2016-11-02 20:26:11 +0100
committerMichael Mann <mmann78@netscape.net>2016-11-02 20:41:43 +0000
commit72ba79b279fb88101683c402fb903a965ceef3d7 (patch)
treea5d412bbd84ff2e20604e23de70f2b2518d56907
parent9e2a9d0eaf4abe10c4f5af3302695aac7d745583 (diff)
btl2cap: Initialize reassembly values
Values in psm_data structure used in reassembly must be initialized to zero to ensure that the reassembly logic works. Change-Id: I47c636dde60f28a8dcd9a366664fd23019a12323 Reviewed-on: https://code.wireshark.org/review/18633 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-btl2cap.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 355e715583..40476bff5c 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -714,7 +714,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_cid = scid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x80000000 : 0x00000000);
k_frame_number = pinfo->num;
- psm_data = wmem_new(wmem_file_scope(), psm_data_t);
+ psm_data = wmem_new0(wmem_file_scope(), psm_data_t);
if (pinfo->p2p_dir == P2P_DIR_RECV) {
psm_data->local_cid = BTL2CAP_UNKNOWN_CID;
psm_data->remote_cid = scid | 0x80000000;
@@ -724,11 +724,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
psm_data->psm = psm;
psm_data->local_service = (pinfo->p2p_dir == P2P_DIR_RECV) ? TRUE : FALSE;
- psm_data->in.mode = 0;
- psm_data->in.txwindow = 0;
psm_data->in.start_fragments = wmem_tree_new(wmem_file_scope());
- psm_data->out.mode = 0;
- psm_data->out.txwindow = 0;
psm_data->out.start_fragments = wmem_tree_new(wmem_file_scope());
psm_data->interface_id = k_interface_id;
psm_data->adapter_id = k_adapter_id;
@@ -870,7 +866,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf
k_cid = scid;
k_frame_number = pinfo->num;
- psm_data = wmem_new(wmem_file_scope(), psm_data_t);
+ psm_data = wmem_new0(wmem_file_scope(), psm_data_t);
psm_data->local_cid = scid;
psm_data->remote_cid = BTL2CAP_UNKNOWN_CID;
@@ -878,10 +874,8 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf
psm_data->psm = psm;
psm_data->local_service = (pinfo->p2p_dir == P2P_DIR_RECV) ? TRUE : FALSE;
psm_data->in.mode = L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE;
- psm_data->in.txwindow = 0;
psm_data->in.start_fragments = wmem_tree_new(wmem_file_scope());
psm_data->out.mode = L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE;
- psm_data->out.txwindow = 0;
psm_data->out.start_fragments = wmem_tree_new(wmem_file_scope());
psm_data->interface_id = k_interface_id;
psm_data->adapter_id = k_adapter_id;