aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-h225.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2021-07-23 15:21:02 -0400
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-07-26 15:30:11 +0000
commite69446aa55d293412002375a549e85327267e65b (patch)
tree784bba0753e5f961df780eb5c9c613828cefca83 /epan/dissectors/packet-h225.c
parent3467b98eb72f8971c83b25b920419b8d0d49016a (diff)
asn1: convert most dissectors to pinfo->pool
Part 1/2 as the commits were too big for CI. Largely find/replace, with a few manual tweaks. Then regenerate the asn1 dissector sources and make sure everything still builds. There are a handful of cases I skipped as too complex, but this covers most of the asn1 dissectors.
Diffstat (limited to 'epan/dissectors/packet-h225.c')
-rw-r--r--epan/dissectors/packet-h225.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index d47dbed12d..aa9c4772ee 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -3027,7 +3027,7 @@ dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
offset = dissect_h225_GloballyUniqueID(tvb, offset, actx, tree, hf_index);
if (guid_tvb)
- tvb_get_ntohguid(guid_tvb, 0, call_id_guid = wmem_new(wmem_packet_scope(), e_guid_t));
+ tvb_get_ntohguid(guid_tvb, 0, call_id_guid = wmem_new(actx->pinfo->pool, e_guid_t));
actx->value_ptr = NULL;
@@ -3836,7 +3836,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
0U, 16383U, &value_int, TRUE);
gefx = gef_ctx_get(actx->private_data);
- if (gefx) gefx->id = wmem_strdup_printf(wmem_packet_scope(), "%u", value_int);
+ if (gefx) gefx->id = wmem_strdup_printf(actx->pinfo->pool, "%u", value_int);
return offset;