summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-05-04 09:38:23 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-05-04 09:59:22 (GMT)
commitfd7d30ec02785084c357cf85c990501fbb97b9cf (patch)
tree2126d410993ab79dea7b1c31029d376fddc3d36f /src/network/socket
parent06531e1ad01ce7ecdc35577575b65b8b3a84483a (diff)
downloadQt-fd7d30ec02785084c357cf85c990501fbb97b9cf.zip
Qt-fd7d30ec02785084c357cf85c990501fbb97b9cf.tar.gz
Qt-fd7d30ec02785084c357cf85c990501fbb97b9cf.tar.bz2
fix crash in QLocalServer::close on Windows
If _q_onNewConnection failed, then QLocalServer got into a bad state. QLocalServer::isListening() still returned true and QLocalServer::close() crashed. Task-number: QTBUG-10388 Reviewed-by: ossi
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qlocalserver_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp
index e820f73..50d6ca4 100644
--- a/src/network/socket/qlocalserver_win.cpp
+++ b/src/network/socket/qlocalserver_win.cpp
@@ -167,8 +167,8 @@ void QLocalServerPrivate::_q_onNewConnection()
q->incomingConnection((quintptr)handle);
} else {
if (GetLastError() != ERROR_IO_INCOMPLETE) {
+ q->close();
setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection"));
- closeServer();
return;
}