qiurui
/
qthttpserver
mirror of https://github.com/qt/qthttpserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in tst_QAbstractHttpServer::websocket() 

Raw pointers to QWebSocket objects are used in the websocket test,
and they are deleted manually at the end of the test, but if the
test fails the QWebSocket objects are not deleted.

Use std::unique_ptr instead to ensure the that the QWebSocket
objects are always deleted.

Change-Id: I71c65698c17bd2a86ffca23f5a6e48874519f0b4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Øystein Heskestad 2024-05-28 14:00:09 +02:00
parent 38cf9e05d4
commit 00646c309e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp
View File

@ -264,10 +264,9 @@ void tst_QAbstractHttpServer::websocket()
auto tcpServer = new QTcpServer;
tcpServer->listen();
server.bind(tcpServer);
auto makeWebSocket = [this, tcpServer] () mutable {
auto s = new QWebSocket(QString::fromUtf8(""),
QWebSocketProtocol::VersionLatest,
this);
auto makeWebSocket = [this, tcpServer]() mutable {
auto s = std::make_unique<QWebSocket>(QString::fromUtf8(""),
QWebSocketProtocol::VersionLatest, this);
const QUrl url(QString::fromLatin1("ws://localhost:%1").arg(tcpServer->serverPort()));
s->open(url);
return s;
@ -282,8 +281,6 @@ void tst_QAbstractHttpServer::websocket()
QTRY_COMPARE(newConnectionSpy.size(), 2);
server.nextPendingWebSocketConnection();
server.nextPendingWebSocketConnection();
delete s1;
delete s2;
#endif // defined(QT_WEBSOCKETS_LIB)
}