diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-21 16:36:24 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-23 17:50:23 +0200 |
| commit | cfaf851e268dac95cb140fbffc1233981ce48d4c (patch) | |
| tree | 0a8ae098f6636fa301c48c3c17a4e9fefdb1e184 /src/corelib/plugin/qlibrary_unix.cpp | |
| parent | 800d0076e0adaeb751f7040fbd7476292e1a2af9 (diff) | |
Fix a few more race conditions with QLibrary::LoadHints
This commit makes replaces the loadHints member with a setter, a getter
and an atomic variable. The setter will not set anything if the library
has already been loaded.
Task-number: QTBUG-39642
Change-Id: Ibb7692f16d80211b52aaf4dc88db1a989738a24d
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/plugin/qlibrary_unix.cpp')
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 43e2b5c15b..b9af143f35 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -162,6 +162,7 @@ bool QLibraryPrivate::load_sys() dlFlags |= BIND_DEFERRED; } #else + int loadHints = this->loadHints(); if (loadHints & QLibrary::ResolveAllSymbolsHint) { dlFlags |= RTLD_NOW; } else { |