1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkReplyFileImpl: Don't emit 'finished' in the ctor

Browse Source 
Fixes: QTBUG-105618
Change-Id: I3bd36fbd5818d54088098e750643c3e2de30496e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 68f641095c5403925e49954aea0e65c4574121e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-09-15 15:52:43 +02:00 committed by Qt Cherry-pick Bot
parent 7bb095f09c
commit f2c00dd038
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/access/qnetworkreplyfileimpl.cpp
View File

@ -57,9 +57,10 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QNetworkAccessManager *manager, con
// we handle only local files // we handle only local files
QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Request for opening non-local file %1").arg(url.toString()); QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Request for opening non-local file %1").arg(url.toString());
setError(QNetworkReply::ProtocolInvalidOperationError, msg); setError(QNetworkReply::ProtocolInvalidOperationError, msg);
setFinished(true); // We're finished, will emit finished() after ctor is done.
QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ProtocolInvalidOperationError)); Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ProtocolInvalidOperationError));
fileOpenFinished(false); QMetaObject::invokeMethod(this, [this](){ fileOpenFinished(false); }, Qt::QueuedConnection);
return; return;
} }
#endif #endif

13
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -260,6 +260,7 @@ private Q_SLOTS:
void ioGetFromFileSpecial(); void ioGetFromFileSpecial();
void ioGetFromFile_data(); void ioGetFromFile_data();
void ioGetFromFile(); void ioGetFromFile();
void ioGetFromFileUrl();
void ioGetFromFtp_data(); void ioGetFromFtp_data();
void ioGetFromFtp(); void ioGetFromFtp();
void ioGetFromFtpWithReuse(); void ioGetFromFtpWithReuse();
@ -3330,6 +3331,18 @@ void tst_QNetworkReply::ioGetFromFile()
QCOMPARE(reader.data, data); QCOMPARE(reader.data, data);
} }
void tst_QNetworkReply::ioGetFromFileUrl()
{
// This immediately fails on non-windows platforms:
QNetworkRequest request(QUrl("file://unc-server/some/path"));
QNetworkReplyPtr reply(manager.get(request));
QSignalSpy finishedSpy(reply.get(), &QNetworkReply::finished);
// QTBUG-105618: This would, on non-Windows platforms, never happen because the signal
// was emitted before the constructor finished, leaving no chance at all to connect to the
// signal
QVERIFY(finishedSpy.wait());
}
void tst_QNetworkReply::ioGetFromFtp_data() void tst_QNetworkReply::ioGetFromFtp_data()
{ {
if (!ftpSupported) if (!ftpSupported)