From fdb2b90685ebc3852740c424170101a196c29ebb Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 10 Apr 2018 20:57:34 +0200 Subject: Core/Players: Prevent creating characters with duplicate name by reserving name early in the process Closes #21656 Closes #21809 --- src/server/game/Cache/CharacterCache.cpp | 16 ++++++++++++++++ src/server/game/Cache/CharacterCache.h | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src/server/game/Cache') diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index da119fc6cba..1bc9a4905a8 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -29,6 +29,7 @@ namespace { std::unordered_map _characterCacheStore; std::unordered_map _characterCacheByNameStore; + std::unordered_set _characterCreationNameStore; } CharacterCache::CharacterCache() @@ -201,6 +202,21 @@ CharacterCacheEntry const* CharacterCache::GetCharacterCacheByName(std::string c return nullptr; } +std::shared_ptr CharacterCache::TryCreateCharacterWithName(std::string const& name) const +{ + auto itr = _characterCacheByNameStore.find(name); + if (itr != _characterCacheByNameStore.end()) + return nullptr; + + auto insertResult = _characterCreationNameStore.insert(name); + if (!insertResult.second) + return nullptr; + + // shared_ptr with custom deleter that erases its held value from _characterCreationNameStore instead of deleting it (points to value inside the container) + return std::shared_ptr(&(*insertResult.first), + [this](std::string const* storedName) { _characterCreationNameStore.erase(*storedName); }); +} + ObjectGuid CharacterCache::GetCharacterGuidByName(std::string const& name) const { auto itr = _characterCacheByNameStore.find(name); diff --git a/src/server/game/Cache/CharacterCache.h b/src/server/game/Cache/CharacterCache.h index ed3239410c4..151b6dcba9e 100644 --- a/src/server/game/Cache/CharacterCache.h +++ b/src/server/game/Cache/CharacterCache.h @@ -55,7 +55,7 @@ class TC_GAME_API CharacterCache bool HasCharacterCacheEntry(ObjectGuid const& guid) const; CharacterCacheEntry const* GetCharacterCacheByGuid(ObjectGuid const& guid) const; CharacterCacheEntry const* GetCharacterCacheByName(std::string const& name) const; - + std::shared_ptr TryCreateCharacterWithName(std::string const& name) const; ObjectGuid GetCharacterGuidByName(std::string const& name) const; bool GetCharacterNameByGuid(ObjectGuid guid, std::string& name) const; uint32 GetCharacterTeamByGuid(ObjectGuid guid) const; -- cgit v1.2.3