From fd882a4e61a302475571ce78c59b83ec04b95730 Mon Sep 17 00:00:00 2001 From: Spp Date: Thu, 21 Feb 2013 01:10:58 +0100 Subject: [PATCH 1/3] Core/Logging: Fix mem leak. Thanks to @Sar777 for the report --- src/server/shared/Logging/Log.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 920ce4ce570..f0275f8c6b2 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -286,7 +286,10 @@ void Log::write(LogMessage* msg) if (worker) worker->enqueue(new LogOperation(logger, msg)); else + { logger->write(*msg); + delete msg; + } } std::string Log::GetTimestampStr() From 7d3fa71a03f4cd05f1e233ef2364b4c9dee6f4e0 Mon Sep 17 00:00:00 2001 From: Spp Date: Thu, 21 Feb 2013 01:16:22 +0100 Subject: [PATCH 2/3] Core/Misc: Remove devel log msg that shouldn't have been commited --- src/server/game/Accounts/AccountMgr.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index bd560c8266e..572327a7bfc 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -439,10 +439,7 @@ void AccountMgr::LoadRBAC() Tokenizer tokens(defaultGroups, ','); for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr) if (uint32 groupId = atoi(*itr)) - { - sLog->outError(LOG_FILTER_LFG, "Adding default group %u", groupId); _defaultGroups.insert(groupId); - } } void AccountMgr::UpdateAccountAccess(RBACData* rbac, uint32 accountId, uint8 securityLevel, int32 realmId) From 5143804014a6485e2cd35f75fa9db64228518ef5 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 21 Feb 2013 14:43:31 +0100 Subject: [PATCH 3/3] Core/Vehicles: Also remove mount auras for passengers not in charm seat May fix related crashes: Ref #9256 #9255 --- src/server/game/Entities/Vehicle/Vehicle.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 8b4516ca47a..1f6c62f0579 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -741,6 +741,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) } Passenger->InterruptNonMeleeSpells(false); + Passenger->RemoveAurasByType(SPELL_AURA_MOUNTED); Player* player = Passenger->ToPlayer(); if (player)