diff options
| author | Evan Huus <eapache@gmail.com> | 2021-07-23 15:21:02 -0400 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-26 15:30:11 +0000 |
| commit | e69446aa55d293412002375a549e85327267e65b (patch) | |
| tree | 784bba0753e5f961df780eb5c9c613828cefca83 /epan/dissectors/asn1/h248 | |
| parent | 3467b98eb72f8971c83b25b920419b8d0d49016a (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/asn1/h248')
| -rw-r--r-- | epan/dissectors/asn1/h248/h248.cnf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/h248/h248.cnf b/epan/dissectors/asn1/h248/h248.cnf index 7556a1b1b5..6f457c2875 100644 --- a/epan/dissectors/asn1/h248/h248.cnf +++ b/epan/dissectors/asn1/h248/h248.cnf @@ -322,7 +322,7 @@ SigParameterV1/value ABBREV=sig_param_value #.END #.FN_HDR TerminationID - curr_info.term = wmem_new0(wmem_packet_scope(), gcp_term_t); + curr_info.term = wmem_new0(actx->pinfo->pool, gcp_term_t); wild_term = GCP_WILDCARD_NONE; #.END @@ -359,13 +359,13 @@ SigParameterV1/value ABBREV=sig_param_value } if (curr_info.term->len) { - curr_info.term->buffer = (guint8 *)tvb_memdup(wmem_packet_scope(),new_tvb,0,curr_info.term->len); + curr_info.term->buffer = (guint8 *)tvb_memdup(actx->pinfo->pool,new_tvb,0,curr_info.term->len); if(term_info.str){ - curr_info.term->str = wmem_strdup_printf(wmem_packet_scope(), "%s %s", - bytestring_to_str(wmem_packet_scope(),curr_info.term->buffer,curr_info.term->len, 0), + curr_info.term->str = wmem_strdup_printf(actx->pinfo->pool, "%s %s", + bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0), term_info.str); }else{ - curr_info.term->str = bytestring_to_str(wmem_packet_scope(),curr_info.term->buffer,curr_info.term->len, 0); + curr_info.term->str = bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0); } } @@ -374,8 +374,8 @@ SigParameterV1/value ABBREV=sig_param_value } else { curr_info.term->len = 0; - curr_info.term->buffer = (guint8*)wmem_strdup(wmem_packet_scope(), ""); - curr_info.term->str = wmem_strdup(wmem_packet_scope(), "?"); + curr_info.term->buffer = (guint8*)wmem_strdup(actx->pinfo->pool, ""); + curr_info.term->str = wmem_strdup(actx->pinfo->pool, "?"); } #.END |