strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cid#1555824 Check of thread-shared field evades lock acquisition

Browse source 
Change-Id: Ic0e8e87138ca86a1618e110516f3d8cef481dec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170626
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Caolán McNamara 2024-07-17 13:15:51 +01:00
parent ec96dfdf2c
commit 3dcc288468
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sdext/source/minimizer/pppoptimizertoken.cxx
View file

@ -23,15 +23,8 @@
#include <sal/macros.h>
#include <unordered_map>
#include <memory>
#include <mutex>
typedef std::unordered_map< const char*, PPPOptimizerTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
static TypeNameHashMap* pHashMap = nullptr;
static std::mutex& getHashMapMutex()
{
static std::mutex s_aHashMapProtection;
return s_aHashMapProtection;
}
namespace {
@ -110,21 +103,19 @@ const TokenTable pTokenTableArray[] =
{ "NotFound", TK_NotFound }
};
static TypeNameHashMap* createHashMap()
{
TypeNameHashMap* pH = new TypeNameHashMap;
const TokenTable* pPtr = pTokenTableArray;
const TokenTable* pEnd = pPtr + SAL_N_ELEMENTS( pTokenTableArray );
for ( ; pPtr < pEnd; pPtr++ )
(*pH)[ pPtr->pS ] = pPtr->pE;
return pH;
}
PPPOptimizerTokenEnum TKGet( std::u16string_view rToken )
{
if ( !pHashMap )
{ // init hash map
std::scoped_lock aGuard( getHashMapMutex() );
if ( !pHashMap )
{
TypeNameHashMap* pH = new TypeNameHashMap;
const TokenTable* pPtr = pTokenTableArray;
const TokenTable* pEnd = pPtr + SAL_N_ELEMENTS( pTokenTableArray );
for ( ; pPtr < pEnd; pPtr++ )
(*pH)[ pPtr->pS ] = pPtr->pE;
pHashMap = pH;
}
}
static TypeNameHashMap* pHashMap = createHashMap();
PPPOptimizerTokenEnum eRetValue = TK_NotFound;
size_t i, nLen = rToken.size();
std::unique_ptr<char[]> pBuf(new char[ nLen + 1 ]);