Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fix invalid pointer use after being deleted

Browse Source
This commit is contained in:
Spp
2013-05-30 11:33:21 +02:00
parent 7ccbbdddd8
commit 782ea4309a
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/server/collision/Models/WorldModel.cpp
View File

@@ -205,35 +205,48 @@ namespace VMAP
bool WmoLiquid::writeToFile(FILE* wf)
{
bool result = true;
if (result && fwrite(&iTilesX, sizeof(uint32), 1, wf) != 1) result = false;
if (result && fwrite(&iTilesY, sizeof(uint32), 1, wf) != 1) result = false;
if (result && fwrite(&iCorner, sizeof(Vector3), 1, wf) != 1) result = false;
if (result && fwrite(&iType, sizeof(uint32), 1, wf) != 1) result = false;
uint32 size = (iTilesX + 1)*(iTilesY + 1);
if (result && fwrite(iHeight, sizeof(float), size, wf) != size) result = false;
size = iTilesX*iTilesY;
if (result && fwrite(iFlags, sizeof(uint8), size, wf) != size) result = false;
bool result = false;
if (fwrite(&iTilesX, sizeof(uint32), 1, wf) == 1 &&
fwrite(&iTilesY, sizeof(uint32), 1, wf) == 1 &&
fwrite(&iCorner, sizeof(Vector3), 1, wf) == 1 &&
fwrite(&iType, sizeof(uint32), 1, wf) == 1)
{
uint32 size = (iTilesX + 1) * (iTilesY + 1);
if (fwrite(iHeight, sizeof(float), size, wf) == size)
{
size = iTilesX*iTilesY;
result = fwrite(iFlags, sizeof(uint8), size, wf) == size;
}
}
return result;
}
bool WmoLiquid::readFromFile(FILE* rf, WmoLiquid* &out)
{
bool result = true;
bool result = false;
WmoLiquid* liquid = new WmoLiquid();
if (result && fread(&liquid->iTilesX, sizeof(uint32), 1, rf) != 1) result = false;
if (result && fread(&liquid->iTilesY, sizeof(uint32), 1, rf) != 1) result = false;
if (result && fread(&liquid->iCorner, sizeof(Vector3), 1, rf) != 1) result = false;
if (result && fread(&liquid->iType, sizeof(uint32), 1, rf) != 1) result = false;
uint32 size = (liquid->iTilesX + 1)*(liquid->iTilesY + 1);
liquid->iHeight = new float[size];
if (result && fread(liquid->iHeight, sizeof(float), size, rf) != size) result = false;
size = liquid->iTilesX * liquid->iTilesY;
liquid->iFlags = new uint8[size];
if (result && fread(liquid->iFlags, sizeof(uint8), size, rf) != size) result = false;
if (fread(&liquid->iTilesX, sizeof(uint32), 1, rf) == 1 &&
fread(&liquid->iTilesY, sizeof(uint32), 1, rf) == 1 &&
fread(&liquid->iCorner, sizeof(Vector3), 1, rf) == 1 &&
fread(&liquid->iType, sizeof(uint32), 1, rf) == 1)
{
uint32 size = (liquid->iTilesX + 1) * (liquid->iTilesY + 1);
liquid->iHeight = new float[size];
if (fread(liquid->iHeight, sizeof(float), size, rf) == size)
{
size = liquid->iTilesX * liquid->iTilesY;
liquid->iFlags = new uint8[size];
result = fread(liquid->iFlags, sizeof(uint8), size, rf) == size;
}
}
if (!result)
delete liquid;
out = liquid;
else
out = liquid;
return result;
}

1
src/server/game/Battlefield/Zones/BattlefieldWG.h
View File

@@ -1481,6 +1481,7 @@ struct WGWorkshop
bf = _bf;
workshopId = _workshopId;
teamControl = BATTLEFIELD_WG_TEAM_NEUTRAL;
}
void GiveControlTo(uint8 team, bool init /* for first call in setup*/)