Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Fixed possible race condition in ShellIntegration class.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-04-20 21:58:37 +02:00
parent 9b430bd36d
commit adff807155
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ShellIntegration.cpp
View File

@ -79,9 +79,11 @@ void ShellIntegration::install(bool async)
return; return;
} }
//Serialize
QMutexLocker lock(&m_mutex);
//Checking //Checking
const int originalState = m_state.fetchAndStoreOrdered(STATE_ENABLED); if(m_state.fetchAndStoreOrdered(STATE_ENABLED) == STATE_ENABLED)
if(originalState == STATE_ENABLED)
{ {
return; /*already enabled, don't enable again!*/ return; /*already enabled, don't enable again!*/
} }
@ -101,7 +103,7 @@ void ShellIntegration::install(bool async)
ok[3] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2\\command").arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellCommand); ok[3] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2\\command").arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellCommand);
if(!(ok[0] && ok[1] && ok[2] && ok[3])) if(!(ok[0] && ok[1] && ok[2] && ok[3]))
{ {
m_state.fetchAndStoreOrdered(originalState); m_state.fetchAndStoreOrdered(STATE_UNKNOWN);
qWarning("Failed to register the LameXP file type!"); qWarning("Failed to register the LameXP file type!");
return; return;
} }
@ -130,11 +132,13 @@ void ShellIntegration::remove(bool async)
return; return;
} }
//Serialize
QMutexLocker lock(&m_mutex);
//Checking //Checking
const int originalState = m_state.fetchAndStoreOrdered(STATE_DISABLD); if(m_state.fetchAndStoreOrdered(STATE_DISABLD) == STATE_DISABLD)
if(originalState == STATE_DISABLD)
{ {
return; /*already enabled, don't enable again!*/ return; /*already disabled, don't disable again!*/
} }
//Init some consts //Init some consts
@ -147,7 +151,7 @@ void ShellIntegration::remove(bool async)
//Find all registered file types //Find all registered file types
if(!MUtils::Registry::reg_enum_subkeys(MUtils::Registry::root_user, "Software\\Classes", fileTypes)) if(!MUtils::Registry::reg_enum_subkeys(MUtils::Registry::root_user, "Software\\Classes", fileTypes))
{ {
m_state.fetchAndStoreOrdered(originalState); m_state.fetchAndStoreOrdered(STATE_UNKNOWN);
qWarning("Failed to enumerate file types!"); qWarning("Failed to enumerate file types!");
return; return;
} }

1
src/ShellIntegration.h
View File

@ -40,5 +40,6 @@ private:
ShellIntegration(void); ShellIntegration(void);
static void initializeTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes); static void initializeTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes);
static QMutex m_mutex;
static QAtomicInt m_state; static QAtomicInt m_state;
}; };