From bffc5d733b7b68ec05c7e735549771a6dc0cf688 Mon Sep 17 00:00:00 2001 From: Dmitry Mikushin Date: Fri, 17 Feb 2023 05:08:09 +0100 Subject: [PATCH] Fixing binary paths array wrongly iterated up to binaryPaths->length() (#216) --- GPService/gpservice.cpp | 6 +++--- GPService/gpservice.h | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/GPService/gpservice.cpp b/GPService/gpservice.cpp index 40d06b8..fea98b1 100644 --- a/GPService/gpservice.cpp +++ b/GPService/gpservice.cpp @@ -34,9 +34,9 @@ GPService::~GPService() QString GPService::findBinary() { - for (int i = 0; i < binaryPaths->length(); i++) { - if (QFileInfo::exists(binaryPaths[i])) { - return binaryPaths[i]; + for (auto& binaryPath : binaryPaths) { + if (QFileInfo::exists(binaryPath)) { + return binaryPath; } } return nullptr; diff --git a/GPService/gpservice.h b/GPService/gpservice.h index b36ae07..22e9fd4 100644 --- a/GPService/gpservice.h +++ b/GPService/gpservice.h @@ -4,14 +4,13 @@ #include #include -static const QString binaryPaths[] { - "/usr/local/bin/openconnect", - "/usr/local/sbin/openconnect", - "/usr/bin/openconnect", - "/usr/sbin/openconnect", - "/opt/bin/openconnect", - "/opt/sbin/openconnect" -}; +static QList binaryPaths = QList() << + "/usr/local/bin/openconnect" << + "/usr/local/sbin/openconnect" << + "/usr/bin/openconnect" << + "/usr/sbin/openconnect" << + "/opt/bin/openconnect" << + "/opt/sbin/openconnect"; class GPService : public QObject {