From 4d7313a466dd775e58705924f72525d4838c70fe Mon Sep 17 00:00:00 2001
From: Aleksei Timofeyev <aleksei.timofeyev@gmail.com>
Date: Fri, 22 Apr 2016 17:00:27 +0500
Subject: 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>
---
 src/network/socket/qlocalsocket_win.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

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;
 }
 
-- 
cgit v1.2.3