aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atalk.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-05-19 17:16:14 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-05-19 17:16:14 +0000
commitfc3f1b5283ffb77cf1135800a616b202904879d7 (patch)
treec1f708812bd86cb9a2f2df53f0f5db677b603f40 /epan/dissectors/packet-atalk.c
parent79e537af335c1e3781ca23bb910fc11a30f36bcc (diff)
From Artem Tamazov (bug 3472):
Save/Restore pinfo->private_data when used. svn path=/trunk/; revision=28412
Diffstat (limited to 'epan/dissectors/packet-atalk.c')
-rw-r--r--epan/dissectors/packet-atalk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 70c06041c4..f3b0f2eff8 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -918,6 +918,8 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
}
if (new_tvb) {
+ void* pd_save;
+ pd_save = pinfo->private_data;
pinfo->private_data = &aspinfo;
/* if port == 6 it's not an ASP packet but a ZIP packet */
if (pinfo->srcport == 6 || pinfo->destport == 6 )
@@ -950,6 +952,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
}
}
+ pinfo->private_data = pd_save;
}
else {
/* Just show this as a fragment. */