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

Merge pull request #325 from AttorneyOnline/bad-packet-handler-improvement

Browse Source 
Handle edge-case in which a packet may be split incorrectly due to extra symbols
This commit is contained in:
stonedDiscord 2022-12-17 12:33:16 +01:00 committed by GitHub
commit 9e75b149c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/network/network_socket.cpp
View File

@ -127,6 +127,7 @@ void NetworkSocket::ws_readData(QString f_data)
QStringList l_all_packets = l_data.split("%");
l_all_packets.removeLast(); // Remove the entry after the last delimiter
l_all_packets.removeAll({}); // Remove empty or null strings.
if (l_all_packets.value(0).startsWith("MC", Qt::CaseInsensitive)) {
l_all_packets = QStringList{l_all_packets.value(0)};

2
core/src/packet/packet_zz.cpp
View File

@ -29,7 +29,7 @@ void PacketZZ::handlePacket(AreaData *area, AOClient &client) const
QString l_modcallNotice = "!!!MODCALL!!!\nArea: " + l_areaName + "\nCaller: " + l_name + "\n";
if (!m_content[0].isEmpty())
if (m_content.size() > 0 && !m_content[0].isEmpty())
l_modcallNotice.append("Reason: " + m_content[0]);
else
l_modcallNotice.append("No reason given.");