projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11f9d18
)
Windows - fix QWindowsSystemProxy global static race
author
Shane Kearns
<ext-shane.2.kearns@nokia.com>
Wed, 22 Feb 2012 21:23:48 +0000
(21:23 +0000)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 6 Mar 2012 17:21:31 +0000
(18:21 +0100)
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>
src/network/kernel/qnetworkproxy_win.cpp
patch
|
blob
|
history
diff --git
a/src/network/kernel/qnetworkproxy_win.cpp
b/src/network/kernel/qnetworkproxy_win.cpp
index
6969a9e
..
33ae4a6
100644
(file)
--- 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;
}