aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-01-25 21:28:01 +0100
committerjackpoz <giacomopoz@gmail.com>2014-01-25 21:28:01 +0100
commit88a5d010164c5299ebca5b8b124f03c386c77fed (patch)
treee19e04acc06bce50764fb28a9e3952258a45be2f /src
parentdbd7cd309bd982f812e08d25b75fa34f5e081ad2 (diff)
Core/Calendar: Crash fix
Attempt to fix #11512 crash by adding a NULL check since GetEvent() can return NULL.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Calendar/CalendarMgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
index f7a6864fb95..52ed50f3948 100644
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@@ -340,7 +340,8 @@ CalendarEventStore CalendarMgr::GetPlayerEvents(uint64 guid)
for (CalendarEventInviteStore::const_iterator itr = _invites.begin(); itr != _invites.end(); ++itr)
for (CalendarInviteStore::const_iterator itr2 = itr->second.begin(); itr2 != itr->second.end(); ++itr2)
if ((*itr2)->GetInviteeGUID() == guid)
- events.insert(GetEvent(itr->first));
+ if (CalendarEvent* event = GetEvent(itr->first)) // NULL check added as attempt to fix #11512
+ events.insert(event);
if (Player* player = ObjectAccessor::FindPlayer(guid))
for (CalendarEventStore::const_iterator itr = _events.begin(); itr != _events.end(); ++itr)