From 5b5e139d1034d2e9b1be39e845d31e01310fc7ab Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 28 Jul 2019 01:23:26 +0200 Subject: [PATCH] Fix for index issue https://discordapp.com/channels/539048679160676382/568904623151382546/604778928787161099 https://discordapp.com/channels/539048679160676382/567983892791951374/593854116992778263 5 org.qt-project.QtCore 0x0000000104efe2c2 qt_assert_x(char const*, char const*, char const*, int) + 80 6 libblackcore.0.9.2.dylib 0x0000000102ad79f1 BlackCore::Vatsim::CVatsimDataFileReader::parseVatsimFile(QNetworkReply*) + 13633 (qstringliteral.h:100) --- src/blackcore/vatsim/vatsimdatafilereader.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index 476f9ead1..954eec862 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -286,8 +286,8 @@ namespace BlackCore bool ok; bool validPos = true; - const double lat = clientPartsMap["latitude"].toDouble(&ok); QStringList posMsg; + const double lat = clientPartsMap["latitude"].toDouble(&ok); if (!ok) { validPos = false; posMsg << QStringLiteral("latitude: '%1'").arg(clientPartsMap["latitude"]); } const double lng = clientPartsMap["longitude"].toDouble(&ok); @@ -297,7 +297,7 @@ namespace BlackCore if (!ok) { validPos = false; posMsg << QStringLiteral("altitude: '%1'").arg(clientPartsMap["altitude"]); } CCoordinateGeodetic position = validPos ? CCoordinateGeodetic(lat, lng, alt) : CCoordinateGeodetic::null(); - Q_ASSERT_X((validPos && posMsg.isEmpty()) || (!validPos && !posMsg.isEmpty()), Q_FUNC_INFO, "Inconsisten data"); + Q_ASSERT_X((validPos && posMsg.isEmpty()) || (!validPos && !posMsg.isEmpty()), Q_FUNC_INFO, "Inconsistent data"); if (!posMsg.isEmpty()) { // Only info not to flood lof with warning @@ -360,7 +360,7 @@ namespace BlackCore if (currentLine.contains("UPDATE")) { const QStringList updateParts = currentLine.replace(" ", "").split('='); - if (updateParts.length() < 2) break; + if (updateParts.length() < 2) { break; } const QString dts = updateParts.at(1).trimmed(); updateTimestampFromFile = fromStringUtc(dts, "yyyyMMddHHmmss"); const bool alreadyRead = (updateTimestampFromFile == this->getUpdateTimestamp()); @@ -376,8 +376,8 @@ namespace BlackCore { // ident:hostname_or_IP:location:name:clients_connection_allowed: const QStringList fsdServerParts = currentLine.split(':'); - if (fsdServerParts.size() < 5) break; - if (!fsdServerParts.at(4).trimmed().contains('1')) break; // allowed? + if (fsdServerParts.size() < 5) { break; } + if (!fsdServerParts.at(4).trimmed().contains('1')) { break; } // allowed? const QString description(fsdServerParts.at(2)); // part(3) could be added const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809, CUser("id", "real name", "email", "password"), @@ -390,8 +390,8 @@ namespace BlackCore { // hostname_or_IP:location:name:clients_connection_allowed:type_of_voice_server: const QStringList voiceServerParts = currentLine.split(':'); - if (voiceServerParts.size() < 3) break; - if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed? + if (voiceServerParts.size() < 4) { break; } + if (!voiceServerParts.at(3).trimmed().contains('1')) { break; } // allowed? const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1, CUser(), CFsdSetup(), CVoiceSetup::vatsimStandard(),