1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QProcess/Unix: detect ASan and TSan dynamically

Browse Source 
Fixes: QTBUG-117533
Fixes: QTBUG-117954
Task-number: QTBUG-104493
Change-Id: I09c3950e719e4b259bc7fffd1793ee472c5d5a9a
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 7c4e271fe73f4775d308d5851c07bc21cdd08570)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9962441bfd0cbb347cb24a685f14a932c0849bd9)
This commit is contained in:
Thiago Macieira 2023-11-02 15:17:53 -07:00
parent 1dc98ca985
commit f0e4f50fd1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qprocess_unix.cpp
View File

@ -510,6 +510,10 @@ static QString resolveExecutable(const QString &program)
return program; return program;
} }
extern "C" {
__attribute__((weak)) pid_t __interceptor_vfork();
}
static int useForkFlags(const QProcessPrivate::UnixExtras *unixExtras) static int useForkFlags(const QProcessPrivate::UnixExtras *unixExtras)
{ {
#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) #if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)
@ -532,6 +536,12 @@ static int useForkFlags(const QProcessPrivate::UnixExtras *unixExtras)
return FFD_USE_FORK; return FFD_USE_FORK;
#endif #endif
// Dynamically detect whether libasan or libtsan are loaded into the
// process' memory. We need this because the user's code may be compiled
// with ASan or TSan, but not Qt.
if (__interceptor_vfork != nullptr)
return FFD_USE_FORK;
if (!unixExtras || !unixExtras->childProcessModifier) if (!unixExtras || !unixExtras->childProcessModifier)
return 0; // no modifier was supplied return 0; // no modifier was supplied