From 22b4ec91c006fec65e655ccbb0dbbc32438f820b Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 4 Jan 2015 21:40:05 -0500 Subject: Replace ep_display_to_address with wmem equivalent display_to_address. Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann --- ui/qt/voip_calls_dialog.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ui/qt/voip_calls_dialog.cpp') diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index 7dfe664c2e..13c38f416f 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -74,17 +74,20 @@ public: if (!call_info) { return; } + char* addr_str; // XXX Pull digit count from capture file precision setText(start_time_col_, QString::number(nstime_to_sec(&(call_info->start_rel_ts)), 'f', 6)); setText(stop_time_col_, QString::number(nstime_to_sec(&(call_info->stop_rel_ts)), 'f', 6)); - setText(initial_speaker_col_, ep_address_to_display(&(call_info->initial_speaker))); + addr_str = (char*)address_to_display(NULL, &(call_info->initial_speaker)); + setText(initial_speaker_col_, addr_str); setText(from_col_, call_info->from_identity); setText(to_col_, call_info->to_identity); setText(protocol_col_, ((call_info->protocol == VOIP_COMMON) && call_info->protocol_name) ? call_info->protocol_name : voip_protocol_name[call_info->protocol]); setText(packets_col_, QString::number(call_info->npackets)); setText(state_col_, voip_call_state_name[call_info->call_state]); + wmem_free(NULL, addr_str); /* Add comments based on the protocol */ QString call_comments; -- cgit v1.2.3