diff options
| author | Christian Klinger | 2016-05-19 16:05:20 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-05-19 16:05:20 +0200 |
| commit | 6e0dd4bd2848b1be03ab733803130b5f07b6b696 (patch) | |
| tree | d323eb5bcecb33d56f7bddc268e954446f3e2bd8 /src/server/net | |
| parent | [shared/server] define preferred styles and enable it if supported (diff) | |
| parent | Closes bug #2807. (And also cleans the code (a bit)) (diff) | |
| download | pvs2-6e0dd4bd2848b1be03ab733803130b5f07b6b696.tar.gz pvs2-6e0dd4bd2848b1be03ab733803130b5f07b6b696.tar.xz pvs2-6e0dd4bd2848b1be03ab733803130b5f07b6b696.zip | |
Merge branch 'bugfix/segfault-clientsize'
Diffstat (limited to 'src/server/net')
| -rw-r--r-- | src/server/net/client.cpp | 2 | ||||
| -rw-r--r-- | src/server/net/discoverylistener.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 8a10cd8..e55fb3b 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -255,7 +255,7 @@ void Client::handleMsg() QByteArray hash(_fromClient.getFieldBytes(_HASH)); QByteArray challenge(_fromClient.getFieldBytes(_CHALLENGE)); if (genSha1(&Global::sessionNameArray(), &_challenge) != hash - && !(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(_socket->peerAddress().toString()))) + && !(Global::getCurrentRoom()->clientPositions.contains(_socket->peerAddress().toString()))) { // Challenge reply is invalid, drop client NetworkMessage msgErr; msgErr.buildErrorMessage("Challenge reply invalid."); diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index c5b06fc..c0b80b8 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -159,9 +159,9 @@ void DiscoveryListener::onReadyRead() if (!Network::isAddressInList(QString::fromUtf8(iplist), addr.toString())) continue; // If so, check if the submitted hash seems valid - if (Global::getCurrentRoom() == "") { continue; } + // if (Global::getCurrentRoom() == "") { continue; } // TODO: Can we remove this check? if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash && - !(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(addr.toString()))) + !(Global::getCurrentRoom()->clientPositions.contains(addr.toString()))) { // did not match local session name and client is not in same room. continue; |