aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/wlan_statistics_dialog.cpp
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-01-30 22:38:20 -0500
committerAnders Broman <a.broman58@gmail.com>2017-01-31 06:35:24 +0000
commita402c1ca2221c019b5b25471cefd25fdc864e09d (patch)
treec9f64a8fba0f77f7150fa56ef4a085011982cfbc /ui/qt/wlan_statistics_dialog.cpp
parentcc479321c387a8684248bf7dde969535f9ebcfad (diff)
format_text -> format_text_wmem for wlan dialogs
format_text_wmem uses NULL scope in GUI dialogs Change-Id: Ifaa342e034de9f99b59169cdf0c7ddc52ff67597 Reviewed-on: https://code.wireshark.org/review/19882 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/wlan_statistics_dialog.cpp')
-rw-r--r--ui/qt/wlan_statistics_dialog.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp
index b577a64f1f..08b58acd90 100644
--- a/ui/qt/wlan_statistics_dialog.cpp
+++ b/ui/qt/wlan_statistics_dialog.cpp
@@ -234,7 +234,9 @@ public:
} else if (wlan_hdr->stats.ssid_len == 1 && wlan_hdr->stats.ssid[0] == 0) {
ssid_text = QObject::tr("<Hidden>");
} else {
- ssid_text = format_text(wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len);
+ gchar *str = format_text_wmem(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len);
+ ssid_text = str;
+ wmem_free(NULL, str);
}
setText(col_ssid_, ssid_text);
@@ -303,8 +305,11 @@ public:
}
if (update_ssid) {
+ gchar* str;
ssid_ = QByteArray::fromRawData((const char *)wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len);
- setText(col_ssid_, format_text(wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len));
+ str = format_text_wmem(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len);
+ setText(col_ssid_, str);
+ wmem_free(NULL, str);
is_ssid_match = true;
}