From bf86a55dd46aae173462137aa5a59d8e24516b83 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 16 Dec 2019 14:50:56 -0600 Subject: Qt UI: Use stack for ssid/pass variables --- ui/qt5/netsimplewifipage.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ui/qt5/netsimplewifipage.cc b/ui/qt5/netsimplewifipage.cc index 9b77295..e6c2d8b 100644 --- a/ui/qt5/netsimplewifipage.cc +++ b/ui/qt5/netsimplewifipage.cc @@ -254,16 +254,17 @@ void NetworkSimpleWirelessPage::associate() { connect(connNotify, &QSocketNotifier::activated, this, &NetworkSimpleWirelessPage::processAssociateMessage); - char *ssid, *pass; + const char *ssid, *pass; + std::string password, network; if(passphrase->isHidden()) { pass = nullptr; } else { - std::string password = ("\"" + passphrase->text().toStdString() + "\""); - pass = strdup(password.c_str()); + password = ("\"" + passphrase->text().toStdString() + "\""); + pass = password.c_str(); } - std::string network = ("\"" + items[0]->text().toStdString() + "\""); - ssid = strdup(network.c_str()); + network = ("\"" + items[0]->text().toStdString() + "\""); + ssid = network.c_str(); tain_now_g(); if(wpactrl_associate_g(&control, ssid, pass) == 0) { @@ -275,8 +276,6 @@ void NetworkSimpleWirelessPage::associate() { dialog->setLabelText(tr("Associating...")); } - free(ssid); - free(pass); return; } -- cgit v1.2.3-60-g2f50