AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLocalSocket/Unix: fix aborting the socket

Browse Source 
According to the documentation, calling abort() should immediately
reset the socket to its initial state. This includes:

  - closing the file descriptor;
  - closing the QLocalSocket as an I/O device;
  - canceling a pending outgoing connection, if it exist;
  - reseting 'serverName' string.

So, adding a call to close() resets the state entirely.

Pick-to: 6.1 6.2
Change-Id: I9c604b5187c6300b437d7aa4c2d06db03edacf21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Alex Trotsenko 2021-07-14 19:58:48 +03:00
parent a7da8e0dab
commit d9c0af92bd
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/socket/qlocalsocket_tcp.cpp
View File

@ -326,6 +326,7 @@ void QLocalSocket::abort()
{ {
Q_D(QLocalSocket); Q_D(QLocalSocket);
d->tcpSocket->abort(); d->tcpSocket->abort();
close();
} }
qint64 QLocalSocket::bytesAvailable() const qint64 QLocalSocket::bytesAvailable() const

1
src/network/socket/qlocalsocket_unix.cpp
View File

@ -508,6 +508,7 @@ void QLocalSocket::abort()
{ {
Q_D(QLocalSocket); Q_D(QLocalSocket);
d->unixSocket.abort(); d->unixSocket.abort();
close();
} }
qint64 QLocalSocket::bytesAvailable() const qint64 QLocalSocket::bytesAvailable() const

6
tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -969,6 +969,7 @@ void tst_QLocalSocket::simpleCommandProtocol2()
server.listen(QStringLiteral("simpleProtocol")); server.listen(QStringLiteral("simpleProtocol"));
QLocalSocket localSocketWrite; QLocalSocket localSocketWrite;
QSignalSpy spyDisconnected(&localSocketWrite, SIGNAL(disconnected()));
localSocketWrite.connectToServer(server.serverName()); localSocketWrite.connectToServer(server.serverName());
QVERIFY(server.waitForNewConnection()); QVERIFY(server.waitForNewConnection());
QLocalSocket* localSocketRead = server.nextPendingConnection(); QLocalSocket* localSocketRead = server.nextPendingConnection();
@ -1010,6 +1011,11 @@ void tst_QLocalSocket::simpleCommandProtocol2()
} }
localSocketWrite.abort(); localSocketWrite.abort();
QCOMPARE(localSocketWrite.state(), QLocalSocket::UnconnectedState);
QCOMPARE(spyDisconnected.count(), 1);
QCOMPARE(localSocketWrite.bytesToWrite(), 0);
QVERIFY(!localSocketWrite.isOpen());
QVERIFY(localSocketRead->waitForDisconnected(1000)); QVERIFY(localSocketRead->waitForDisconnected(1000));
} }