summaryrefslogtreecommitdiff
path: root/ui/qt/conversation_dialog.cpp
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-10 14:20:06 -0500
committerMichael Mann <mmann78@netscape.net>2015-01-10 19:58:21 +0000
commit14cad60f7d4b60b9974e9f1f79d22d60900e3e6b (patch)
treeb972f6850290c9fabda18383247019189bb072e7 /ui/qt/conversation_dialog.cpp
parent59c1e32d2c6dbdd353ae996d9538141bb029d6d0 (diff)
downloadwireshark-14cad60f7d4b60b9974e9f1f79d22d60900e3e6b.tar.gz
Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af Reviewed-on: https://code.wireshark.org/review/6480 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/conversation_dialog.cpp')
-rw-r--r--ui/qt/conversation_dialog.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index b96db0819c..4c46d7614c 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -711,7 +711,10 @@ void ConversationTreeWidget::filterActionTriggered()
return;
}
- QString filter = get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]);
+ char* tmp_str = (char*)get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]);
+ QString filter(tmp_str);
+
+ g_free(tmp_str);
emit filterAction(filter, fa->action(), fa->actionType());
}