summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-02-22 21:23:48 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-06 18:21:31 +0100
commit2cf8e487a5c546382daaa954c23d3926668b0a85 (patch)
tree65e9ad9c89fda4577944b20bb39cdae35859f911 /src/network
parent11f9d187312f54dce4f5233b7fe696a0d949facc (diff)
Windows - fix QWindowsSystemProxy global static race
Loser of the race would try to delete an uninitialised pointer Task-number: QTBUG-15765 Change-Id: Ie184ee2306e102aa8fbad752ef09b95c3ede00c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/kernel/qnetworkproxy_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index 6969a9effd..33ae4a6a14 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -256,7 +256,7 @@ public:
Q_GLOBAL_STATIC(QWindowsSystemProxy, systemProxy)
QWindowsSystemProxy::QWindowsSystemProxy()
- : initialized(false), functional(false), isAutoConfig(false)
+ : hHttpSession(0), initialized(false), functional(false), isAutoConfig(false)
{
defaultResult << QNetworkProxy::NoProxy;
}