aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btl2cap.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-05-19 17:16:14 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-05-19 17:16:14 +0000
commit6ce6394a26aa87eb0b4b95ecd4725ef817a52612 (patch)
treec1f708812bd86cb9a2f2df53f0f5db677b603f40 /epan/dissectors/packet-btl2cap.c
parente35b80409e2c1126a3470ef580f546d6c719bab5 (diff)
From Artem Tamazov (bug 3472):
Save/Restore pinfo->private_data when used. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28412 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-btl2cap.c')
-rw-r--r--epan/dissectors/packet-btl2cap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 45144cbd6a..80c9236e31 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -787,6 +787,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
bthci_acl_data_t *acl_data;
btl2cap_data_t *l2cap_data;
config_data_t *config_data;
+ void* pd_save;
if(check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2CAP");
@@ -813,6 +814,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l2cap_data=ep_alloc(sizeof(btl2cap_data_t));
l2cap_data->chandle=acl_data->chandle;
l2cap_data->cid=cid;
+ pd_save = pinfo->private_data;
pinfo->private_data=l2cap_data;
if(cid==0x0001){ /* This is a command packet*/
@@ -984,6 +986,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
offset+=length;
}
+ pinfo->private_data = pd_save;
}