diff options
| author | Evan Huus <eapache@gmail.com> | 2021-08-17 16:26:50 -0400 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-08-19 15:07:44 +0000 |
| commit | eda26f9e5f07b0f7c6bf018fd8b7b81fe4c06af8 (patch) | |
| tree | 00f44522d848054b1333ba06e6b32f547b78c162 /epan/dissectors/packet-h225.c | |
| parent | 042001fb55c76cb31a6f954756cab89b60bb0d39 (diff) | |
wmem: convert more asn1 dissectors to pinfo->pool
We prefer pinfo->pool over the global wmem_packet_scope() now. Convert a
few more asn1 dissectors. After this commit, just three asn1 dissectors
remain.
Diffstat (limited to 'epan/dissectors/packet-h225.c')
| -rw-r--r-- | epan/dissectors/packet-h225.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index aa9c4772ee..4f3558f48c 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -3885,7 +3885,7 @@ dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac NULL); #line 885 "./asn1/h225/h225.cnf" - gef_ctx_update_key(gef_ctx_get(actx->private_data)); + gef_ctx_update_key(actx->pinfo->pool, gef_ctx_get(actx->private_data)); gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); @@ -4023,7 +4023,7 @@ dissect_h225_EnumeratedParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); - actx->private_data = gef_ctx_alloc(parent_gefx, NULL); + actx->private_data = gef_ctx_alloc(actx->pinfo->pool, parent_gefx, NULL); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_EnumeratedParameter, EnumeratedParameter_sequence); @@ -4050,7 +4050,7 @@ dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /* check if not inherited from FeatureDescriptor */ gefx = gef_ctx_get(actx->private_data); if (!gefx) { - gefx = gef_ctx_alloc(NULL, "GenericData"); + gefx = gef_ctx_alloc(actx->pinfo->pool, NULL, "GenericData"); actx->private_data = gefx; } @@ -4098,7 +4098,7 @@ static int dissect_h225_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 874 "./asn1/h225/h225.cnf" void *priv_data = actx->private_data; - actx->private_data = gef_ctx_alloc(NULL, "FeatureDescriptor"); + actx->private_data = gef_ctx_alloc(actx->pinfo->pool, NULL, "FeatureDescriptor"); offset = dissect_h225_GenericData(tvb, offset, actx, tree, hf_index); |