diff options
| author | Evan Huus <eapache@gmail.com> | 2021-07-23 15:21:02 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2021-07-26 14:00:09 -0400 |
| commit | d09fb571fe4f2633ce888f35edae6e333665858c (patch) | |
| tree | f43759c81f7b733abb259106af8a015ed0d558f8 /epan/dissectors/packet-s1ap.c | |
| parent | e69446aa55d293412002375a549e85327267e65b (diff) | |
asn1: convert most dissectors to pinfo->pool
Part 2/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-s1ap.c')
| -rw-r--r-- | epan/dissectors/packet-s1ap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 7cc12b6c38..f3a2f8936c 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -2093,7 +2093,7 @@ dissect_s1ap_warningMessageContents(tvbuff_t *warning_msg_tvb, proto_tree *tree, cb_data_page_tvb = tvb_new_subset_length(warning_msg_tvb, offset, length); cb_data_tvb = dissect_cbs_data(dcs, cb_data_page_tvb, tree, pinfo, 0); if (cb_data_tvb) { - str = tvb_get_string_enc(wmem_packet_scope(), cb_data_tvb, 0, tvb_reported_length(cb_data_tvb), ENC_UTF_8|ENC_NA); + str = tvb_get_string_enc(pinfo->pool, cb_data_tvb, 0, tvb_reported_length(cb_data_tvb), ENC_UTF_8|ENC_NA); proto_tree_add_string_format(tree, hf_decoded_page, warning_msg_tvb, offset, 83, str, "Decoded Page %u: %s", i+1, str); } @@ -3171,7 +3171,7 @@ dissect_s1ap_TAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ #line 1446 "./asn1/s1ap/s1ap.cnf" struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo); s1ap_data->number_type = E212_TAI; - s1ap_data->tai = wmem_new0(wmem_packet_scope(), struct s1ap_tai); + s1ap_data->tai = wmem_new0(actx->pinfo->pool, struct s1ap_tai); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_TAI, TAI_sequence); @@ -4931,8 +4931,8 @@ dissect_s1ap_SupportedTAs_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac (s1ap_data->message_type == INITIATING_MESSAGE) && ((s1ap_data->procedure_code == id_S1Setup) || (s1ap_data->procedure_code == id_ENBConfigurationUpdate))) { - s1ap_data->supported_ta = wmem_new0(wmem_packet_scope(), struct s1ap_supported_ta); - s1ap_data->supported_ta->plmn = wmem_array_new(wmem_packet_scope(), sizeof(guint32)); + s1ap_data->supported_ta = wmem_new0(actx->pinfo->pool, struct s1ap_supported_ta); + s1ap_data->supported_ta->plmn = wmem_array_new(actx->pinfo->pool, sizeof(guint32)); } |