From 87eb22f4648fd5283d2c91c2046c0aa90b7b469b Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 22 Jun 2013 15:08:18 +0000 Subject: More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone. svn path=/trunk/; revision=50113 --- epan/dissectors/packet-cmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-cmp.c') diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 96e6b5d5da..99770656ba 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -386,7 +386,7 @@ dissect_cmp_PKIFreeText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmp_type_oid, (const char**)&actx->private_data); + offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmp_type_oid, &actx->external.direct_reference); return offset; } @@ -396,7 +396,7 @@ dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmp_T_infoValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 90 "../../asn1/cmp/cmp.cnf" - offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); -- cgit v1.2.3