diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-08-11 19:39:43 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-08-16 18:12:47 +0000 |
commit | 4fbc63f03bf14c3c5e8e2ffde243fe81535d3007 (patch) | |
tree | 1722c802163cd95a512ff774a673b10183a50f5d /src | |
parent | c72311440b160f37d5175c131508d37249889a36 (diff) |
Fix thread-safety of qnetworkinterface_win.cpp:resolveLibs
Change-Id: Ia4b5103c9c590c24de9a43c5c7097b0c7b83e679
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/network/kernel/qnetworkinterface_win.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index ddeb6c111f..eeb2e1665a 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -58,11 +58,11 @@ static void resolveLibs() static bool done = false; if (!done) { - done = true; - HINSTANCE iphlpapiHnd = QSystemLibrary::load(L"iphlpapi"); - if (iphlpapiHnd == NULL) + if (iphlpapiHnd == NULL) { + done = true; return; + } #if defined(Q_OS_WINCE) ptrGetAdaptersInfo = (PtrGetAdaptersInfo)GetProcAddress(iphlpapiHnd, L"GetAdaptersInfo"); @@ -73,6 +73,7 @@ static void resolveLibs() ptrGetAdaptersAddresses = (PtrGetAdaptersAddresses)GetProcAddress(iphlpapiHnd, "GetAdaptersAddresses"); ptrGetNetworkParams = (PtrGetNetworkParams)GetProcAddress(iphlpapiHnd, "GetNetworkParams"); #endif + done = true; } } |