Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vastly improve client version string validation

Browse Source
This commit is contained in:
in1tiate 2021-03-11 02:22:03 -06:00
parent 953426fea1
commit 7157d5410e
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/packets.cpp
View File

@ -55,28 +55,14 @@ void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacke
}; };
// Extremely cursed client version string validation
// Ideally version strings should be X.X.X but it can be literally anything
// so we have to be super careful
version.string = argv[1]; version.string = argv[1];
QStringList version_raw = version.string.split("."); QRegExp rx("\\b(\\d+)\\.(\\d+)\\.(\\d+)\\b"); // matches X.X.X (e.g. 2.9.0, 2.4.10, etc.)
bool ok; if (rx.indexIn(version.string) != -1) {
int release_version = version_raw[0].toInt(&ok); QStringList version_raw = rx.capturedTexts();
if (ok && version_raw.size() >= 1) version.release = version_raw[0].toInt();
version.release = release_version; version.major = version_raw[1].toInt();
if (ok && version_raw.size() >= 2) { version.minor = version_raw[2].toInt();
int major_version = version_raw[1].toInt(&ok);
if (ok)
version.major = major_version;
} }
if (ok && version_raw.size() >= 3) {
int minor_version = version_raw[2].toInt(&ok);
if (ok)
version.minor = minor_version;
}
sendPacket("PN", {QString::number(server->player_count), max_players}); sendPacket("PN", {QString::number(server->player_count), max_players});
sendPacket("FL", feature_list); sendPacket("FL", feature_list);