Core/DataStores: Fixed creating entries in sEmotesTextSoundMap if pas…

…sed invalid arguments (also a data race, if done in multiple threads)
TrinityCore · Apr 2, 2016 · a2344fb · a2344fb
1 parent e52878b
commit a2344fb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
@@ -1017,5 +1017,6 @@ ResponseCodes ValidateName(std::string const& name, LocaleConstant locale)
 
 EmotesTextSoundEntry const* FindTextSoundEmoteFor(uint32 emote, uint32 race, uint32 gender)
 {
-    return sEmotesTextSoundMap[EmotesTextSoundKey(emote, race, gender)];
+    auto itr = sEmotesTextSoundMap.find(EmotesTextSoundKey(emote, race, gender));
+    return itr != sEmotesTextSoundMap.end() ? itr->second : nullptr;
 }