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-rlogin.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-rlogin.c')
-rw-r--r-- | epan/dissectors/packet-rlogin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 91a0b473c3..4da21ca516 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -256,7 +256,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, user_info_item = proto_tree_add_string_format(rlogin_tree, hf_user_info, tvb, offset, info_len, FALSE, "User info (%s)", - tvb_format_text(tvb, offset, info_len)); + tvb_format_text(pinfo->pool, tvb, offset, info_len)); user_info_tree = proto_item_add_subtree(user_info_item, ett_rlogin_user_info); @@ -460,7 +460,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* Add data into info column */ col_append_fstr(pinfo->cinfo, COL_INFO, "Data: %s", - tvb_format_text(tvb, 0, bytes_to_copy)); + tvb_format_text(pinfo->pool, tvb, 0, bytes_to_copy)); } } } |