From b94e1cdc1d9e961946faff65d0bf1a399c416097 Mon Sep 17 00:00:00 2001
From: Nayd <dnpd.dd@gmail.com>
Date: Sun, 16 Nov 2014 01:20:12 +0000
Subject: Core/Loading: Fix crash in LoadMissingKeyChains

Also emptied `world`.`keychain_db2`

Closes #13566
---
 src/server/game/Globals/ObjectMgr.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 755b6a2ac59..90a40aa7990 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -9014,6 +9014,12 @@ void ObjectMgr::LoadMissingKeyChains()
         uint32 id = fields[0].GetUInt32();
 
         KeyChainEntry* kce = sKeyChainStore.CreateEntry(id, true);
+        if (!kce)
+        {
+            TC_LOG_ERROR("sql.sql", "Could not create KeyChainEntry %u, skipped.", id);
+            continue;
+        }
+
         kce->Id = id;
         for (uint32 i = 0; i < KEYCHAIN_SIZE; ++i)
             kce->Key[i] = fields[1 + i].GetUInt8();
-- 
cgit v1.2.3