aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-packetlogger.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-01-29 18:51:00 -0500
committerMichael Mann <mmann78@netscape.net>2017-01-30 02:25:45 +0000
commitf789c91a5ebbbefba51aa3da983fe836ebc860d6 (patch)
treece4a066bc1d1e8fe4a3bfc1f49e171d8aeda33d2 /epan/dissectors/packet-packetlogger.c
parent9365fd3d3a4cdac07d70bd77f7a42f3260b33b5e (diff)
Have format_text_wsp use wmem allocated memory.
format_text_wsp is fed into by tvb_format_text_wsp and tvb_format_stringzpad_wsp so those functions need to add a wmem allocated parameter as well. Most of the changes came from tvb_format_text_wsp and tvb_format_stringzpad_wsp being changed more so than format_text_wsp. Change-Id: I52214ca107016f0e96371a9a8430aa89336f91d7 Reviewed-on: https://code.wireshark.org/review/19851 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-packetlogger.c')
-rw-r--r--epan/dissectors/packet-packetlogger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 6c0da73f1a..8eb6466d9c 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -148,7 +148,7 @@ static int dissect_packetlogger(tvbuff_t *tvb, packet_info *pinfo,
case PKT_NOTE:
case PKT_NEW_CONTROLLER:
proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_ASCII|ENC_NA);
- col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (next_tvb, 0, len));
+ col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (wmem_packet_scope(), next_tvb, 0, len));
break;
default:
call_data_dissector(next_tvb, pinfo, tree);