diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-22 21:23:48 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 16:15:35 (GMT) |
| commit | 70545d13e2f97b84e84cab17610209cfc45fc410 (patch) | |
| tree | 13f8f6b051702ea2206fe80d53c1fac5574ea6cf /src/network/kernel | |
| parent | a641da349ffcd92baea238d06acc7c7b886302c9 (diff) | |
| download | Qt-70545d13e2f97b84e84cab17610209cfc45fc410.zip Qt-70545d13e2f97b84e84cab17610209cfc45fc410.tar.gz Qt-70545d13e2f97b84e84cab17610209cfc45fc410.tar.bz2 | |
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>
(cherry picked from commit 2cf8e487a5c546382daaa954c23d3926668b0a85)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 84b2b79..886a61c 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; } |