summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAleksei Timofeyev <aleksei.timofeyev@gmail.com>2016-04-22 17:00:27 +0500
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-01-23 11:40:26 +0000
commit4d7313a466dd775e58705924f72525d4838c70fe (patch)
tree52499906974bcf4fd9fd250f8a4b962dece2c0a6 /src
parentecf025f613e5f59a8653ffd2d3d4aa6f47b668df (diff)
QLocalSocket/Win: Fix access to deleted pipeWriter
waitForWrite can emit a signal outside QLocalSocket and pipeWriter could be deleted there. Change-Id: Ic35ec6455bd05402fd38fb3e1b219aa4534a0ff6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/socket/qlocalsocket_win.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index bed4355aa9..312c934632 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -309,10 +309,8 @@ bool QLocalSocket::flush()
{
Q_D(QLocalSocket);
bool written = false;
- if (d->pipeWriter) {
- while (d->pipeWriter->waitForWrite(0))
- written = true;
- }
+ while (d->pipeWriter && d->pipeWriter->waitForWrite(0))
+ written = true;
return written;
}