diff options
| author | Evan Huus <eapache@gmail.com> | 2021-08-27 14:56:00 -0400 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2021-09-01 03:54:52 +0000 |
| commit | cdfab0d6e991df2fd3591ef896ba36937a8d4dfc (patch) | |
| tree | 180c49932c562eb644c5f24d6c8d8cbf13a936e3 /epan/dissectors/packet-lmp.c | |
| parent | 61e66c37abb1b7f59726e4407ac8dd53e6b75cac (diff) | |
tvbuff: convert helper methods to pinfo->pool
A few of them just needed scratch memory, so allocate and free it
manually after doing any exception-raising checks.
A few others were returning memory, and needed conversion to accept a
wmem scope argument.
Diffstat (limited to 'epan/dissectors/packet-lmp.c')
| -rw-r--r-- | epan/dissectors/packet-lmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 64274d88d7..1d1561b62e 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -1459,10 +1459,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) tvb, offset2+2, 2, l); if (l && l <= obj_length - 8) { proto_item_append_text(lmp_object_tree, " = %s", - tvb_format_text(tvb, offset2+4, l)); + tvb_format_text(pinfo->pool, tvb, offset2+4, l)); proto_tree_add_string(lmp_object_tree, hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG], - tvb, offset2+4, l, tvb_format_text(tvb, + tvb, offset2+4, l, tvb_format_text(pinfo->pool, tvb, offset2+4,l)); } else @@ -1482,10 +1482,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN], tvb, offset2+2, 2, l); proto_item_append_text(lmp_object_tree, " = %s", - tvb_format_text(tvb, offset2+4, l)); + tvb_format_text(pinfo->pool, tvb, offset2+4, l)); proto_tree_add_string(lmp_object_tree, hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG], - tvb, offset2+4, l, tvb_format_text(tvb, offset2+4,l)); + tvb, offset2+4, l, tvb_format_text(pinfo->pool, tvb, offset2+4,l)); break; default: |