*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp
index bb4cd22edfa..366c5923351 100644
--- a/src/game/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvPSI.cpp
@@ -201,7 +201,11 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
                         GameObject * go = new GameObject;
                         Map * map = MapManager::Instance().GetMap(plr->GetMapId(), plr);
                         if(!map)
+                        {
+                            delete go;
                             return true;
+                        }
+                        
                         if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
                         {
                             delete go;