From e3da17caa805ed513ffb96104b31f2fce5448326 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 23 Sep 2017 00:09:08 +0800 Subject: [PATCH] Update qtsingleapplication To upstream version a8dda66d7738cde9042b87db27993f710ae3eeeb --- src/app/qtsingleapplication/qtlocalpeer.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/app/qtsingleapplication/qtlocalpeer.cpp b/src/app/qtsingleapplication/qtlocalpeer.cpp index c7ce52762..f3c4546b6 100644 --- a/src/app/qtsingleapplication/qtlocalpeer.cpp +++ b/src/app/qtsingleapplication/qtlocalpeer.cpp @@ -176,8 +176,17 @@ void QtLocalPeer::receiveConnection() if (!socket) return; - while (socket->bytesAvailable() < (int)sizeof(quint32)) + while (true) { + if (socket->state() == QLocalSocket::UnconnectedState) { + qWarning("QtLocalPeer: Peer disconnected"); + delete socket; + return; + } + if (socket->bytesAvailable() >= qint64(sizeof(quint32))) + break; socket->waitForReadyRead(); + } + QDataStream ds(socket); QByteArray uMsg; quint32 remaining;