diff options
| author | est31 <MTest31@outlook.com> | 2015-07-27 07:44:48 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-27 08:15:39 +0200 |
| commit | f336d3ffb657d2fcc72d06c28642c1b418e8dec4 (patch) | |
| tree | 8c5e75015399b64b96b63ebc8e03f98c1a341460 | |
| parent | c30a2d68541b6ff451d92709478b4e37cac86447 (diff) | |
| download | minetest-f336d3ffb657d2fcc72d06c28642c1b418e8dec4.tar.gz minetest-f336d3ffb657d2fcc72d06c28642c1b418e8dec4.tar.bz2 minetest-f336d3ffb657d2fcc72d06c28642c1b418e8dec4.zip | |
Fix srp.cpp:815 leak
Thanks @Zeno-
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/network/clientpackethandler.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp index 74072d9d7..63f720f04 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -974,6 +974,7 @@ void Client::deleteAuthData() case AUTH_MECHANISM_NONE: break; } + m_chosen_auth_mech = AUTH_MECHANISM_NONE; } @@ -1060,7 +1061,6 @@ void Client::startAuth(AuthMechanism chosen_auth_mechanism) NetworkPacket resp_pkt(TOSERVER_SRP_BYTES_A, 0); resp_pkt << std::string(bytes_A, len_A) << based_on; - free(bytes_A); Send(&resp_pkt); break; } diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 2133543d9..86091bc88 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -100,7 +100,6 @@ void Client::handleCommand_Hello(NetworkPacket* pkt) void Client::handleCommand_AuthAccept(NetworkPacket* pkt) { - m_chosen_auth_mech = AUTH_MECHANISM_NONE; deleteAuthData(); v3f playerpos; @@ -126,7 +125,6 @@ void Client::handleCommand_AuthAccept(NetworkPacket* pkt) } void Client::handleCommand_AcceptSudoMode(NetworkPacket* pkt) { - m_chosen_auth_mech = AUTH_MECHANISM_NONE; deleteAuthData(); m_password = m_new_password; @@ -144,7 +142,6 @@ void Client::handleCommand_DenySudoMode(NetworkPacket* pkt) m_chat_queue.push(L"Password change denied. Password NOT changed."); // reset everything and be sad deleteAuthData(); - m_chosen_auth_mech = AUTH_MECHANISM_NONE; } void Client::handleCommand_InitLegacy(NetworkPacket* pkt) { |