teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Fix memory leaks related to WorldEvents as suggested by Koncord

Browse source
This commit is contained in:
David Cernat 2017-01-29 20:18:19 +02:00
parent 6b9fba7885
commit 5eff2ece21
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw-mp/Networking.cpp
View file

@ -21,7 +21,7 @@ using namespace std;
Networking *Networking::sThis = 0; Networking *Networking::sThis = 0;
static WorldEvent *worldEvent; static WorldEvent *worldEvent = nullptr;
Networking::Networking(RakNet::RakPeerInterface *peer) Networking::Networking(RakNet::RakPeerInterface *peer)
{ {
@ -417,6 +417,13 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
return; return;
WorldPacket *myPacket = worldController->GetPacket(packet->data[0]); WorldPacket *myPacket = worldController->GetPacket(packet->data[0]);
if (worldEvent)
{
delete worldEvent;
worldEvent = nullptr;
}
worldEvent = new WorldEvent(player->guid); worldEvent = new WorldEvent(player->guid);
mwmp::WorldObject worldObject; mwmp::WorldObject worldObject;

8
apps/openmw-mp/Script/Functions/World.cpp
View file

@ -9,7 +9,7 @@
using namespace mwmp; using namespace mwmp;
static WorldEvent *worldEvent; static WorldEvent *worldEvent = nullptr;
std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$"); std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$");
@ -18,6 +18,12 @@ void WorldFunctions::CreateWorldEvent(unsigned short pid) noexcept
Player *player; Player *player;
GET_PLAYER(pid, player, ); GET_PLAYER(pid, player, );
if (worldEvent)
{
delete worldEvent;
worldEvent = nullptr;
}
worldEvent = new WorldEvent(player->guid); worldEvent = new WorldEvent(player->guid);
} }