diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-05-19 17:16:14 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-05-19 17:16:14 +0000 |
| commit | fc3f1b5283ffb77cf1135800a616b202904879d7 (patch) | |
| tree | c1f708812bd86cb9a2f2df53f0f5db677b603f40 /epan/dissectors/packet-btl2cap.c | |
| parent | 79e537af335c1e3781ca23bb910fc11a30f36bcc (diff) | |
| download | wireshark-fc3f1b5283ffb77cf1135800a616b202904879d7.tar.gz | |
From Artem Tamazov (bug 3472):
Save/Restore pinfo->private_data when used.
svn path=/trunk/; revision=28412
Diffstat (limited to 'epan/dissectors/packet-btl2cap.c')
| -rw-r--r-- | epan/dissectors/packet-btl2cap.c | 3 |
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; } |