arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-06 10:35:46 +00:00
Code Issues Projects Releases Wiki Activity

fix possible segfaults with null arrays (#5)

Browse Source
This commit is contained in:
arcan1s
2014-07-20 12:20:26 +04:00
parent 099b4e3792
commit 43de4e5738
7 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/gui/src/language.cpp
View File

@ -69,7 +69,9 @@ QString Language::defineLanguageFromFile(const QString configPath)
return language;
while (true) {
fileStr = QString(configFile.readLine());
if (fileStr.isEmpty()) continue;
if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue;
if (fileStr.contains(QString("LANGUAGE=")))
language = fileStr.split(QChar('='))[1]
.remove(QChar(' '))

1
sources/gui/src/mainwindow.cpp
View File

@ -231,7 +231,6 @@ void MainWindow::createActions()
connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int)));
connect(ui->actionAbout, SIGNAL(triggered(bool)), aboutWin, SLOT(show()));
connect(ui->actionNetctlAuto, SIGNAL(triggered(bool)), netctlAutoWin, SLOT(showWindow()));
ui->actionNetctlAuto->setVisible(checkExternalApps(QString("all")));
connect(ui->actionSettings, SIGNAL(triggered(bool)), settingsWin, SLOT(showWindow()));
connect(ui->actionQuit, SIGNAL(triggered(bool)), this, SLOT(close()));

1
sources/gui/src/settingswindow.cpp
View File

@ -358,6 +358,7 @@ QMap<QString, QString> SettingsWindow::getSettings()
return settings;
while (true) {
fileStr = QString(configFile.readLine()).trimmed();
if (fileStr.isEmpty()) continue;
if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue;
if (!fileStr.contains(QChar('='))) continue;