diff options
author | Alex Trotsenko <alex1973tr@gmail.com> | 2021-07-21 20:06:20 +0300 |
---|---|---|
committer | Alex Trotsenko <alex1973tr@gmail.com> | 2021-07-24 11:52:42 +0300 |
commit | 719116db3dd1fbeccb52e6e1340853f3ad969e1b (patch) | |
tree | 1045aece8a54387f2a48273eff9767f48837c408 /src/network | |
parent | d9c0af92bd893e1f6a0b4c627300ea96a73aba55 (diff) |
QLocalSocket/Win: remove dead code in disconnectFromServer()
The _q_pipeClosed() slot unconditionally removes the pipeWriter just
before closing the pipe. Thus, if we have an invalid handle here,
the pipe writer has already been destroyed anyway.
Change-Id: I57463d8464afe6141c21a63851a56ebddabd3f13
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e8797ba4ab..de502d0e7b 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -407,14 +407,6 @@ void QLocalSocket::disconnectFromServer() { Q_D(QLocalSocket); - // Are we still connected? - if (!isValid()) { - // If we have unwritten data, the pipeWriter is still present. - // It must be destroyed before close() to prevent an infinite loop. - delete d->pipeWriter; - d->pipeWriter = 0; - } - flush(); if (bytesToWrite() != 0) { d->state = QLocalSocket::ClosingState; |