diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-05-31 17:02:24 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-30 09:23:03 +0000 |
| commit | 6fb6fcd112435faed9f05165bc4de35ebb1b8d03 (patch) | |
| tree | d6995cd9871c060f815121bc569f1281242839fc /src/lib/corelib/tools/launcherinterface.cpp | |
| parent | 215c78da617621d4301fd0f9e78a8873a3ef9a0e (diff) | |
Fix data race when calling LauncherSocket::isReady
According to C++ standard, it is not allowed to read/write non-atomic
variable from different threads.
Change-Id: Ia48a997b1f417ed68234afdcaad6d70c92d26064
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools/launcherinterface.cpp')
| -rw-r--r-- | src/lib/corelib/tools/launcherinterface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/launcherinterface.cpp b/src/lib/corelib/tools/launcherinterface.cpp index 50ac659a9..d2cdf44df 100644 --- a/src/lib/corelib/tools/launcherinterface.cpp +++ b/src/lib/corelib/tools/launcherinterface.cpp @@ -128,8 +128,7 @@ void LauncherInterface::doStop() if (!m_process) return; m_process->disconnect(); - if (m_socket->isReady()) - m_socket->shutdown(); + m_socket->shutdown(); m_process->waitForFinished(3000); m_process->deleteLater(); m_process = nullptr; |