From 297323652b1e7932ef73443d2eea2916705997fa Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 20 Jan 2022 13:19:28 +0100 Subject: [PATCH] Work-around crash in QThreadPool QThread usage This works around mismatch in threads starting and restarting QThreads, and is safe since we don't need to establish a binding, and objectName access in QThreadPool is locked behind a mutex. Fixes: QTBUG-96718 Change-Id: Id3f75e4f8344796ca658899645219fe3373ddd6d Reviewed-by: Marc Mutz (cherry picked from commit 664c56d6b184b37546acc93128a692fa1bea7c3e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qthread_unix.cpp | 4 +++- src/corelib/thread/qthread_win.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 81b5416a988..4417c525e37 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -710,7 +710,9 @@ void QThread::start(Priority priority) else pthread_attr_setthreadname(&attr, objectName().toLocal8Bit()); #else - d->objectName = objectName(); + // avoid interacting with the binding system + d->objectName = d->extraData ? d->extraData->objectName.valueBypassingBindings() + : QString(); #endif pthread_t threadId; diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 6249b94ea21..cda5fe4de13 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -420,7 +420,9 @@ void QThread::start(Priority priority) if (d->running) return; - d->objectName = objectName(); + // avoid interacting with the binding system + d->objectName = d->extraData ? d->extraData->objectName.valueBypassingBindings() + : QString(); d->running = true; d->finished = false; d->exited = false;