Skip to content

Commit a2e47fa

Browse files
author
Michal Klocek
committed
Do not proceed with uninitialized resources
QRC files can be optimized with CONFIG+=qtquickcompiler and removed, in that case 'size' of resource is zero. Do not process 'empty' resources. Throw warning. Fixes: QTBUG-76403 Change-Id: If21ff698e7985f82e6456500d4d24cb366cff012 Reviewed-by: Kai Koehne <[email protected]>
1 parent 49d4da1 commit a2e47fa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/core/net/url_request_qrc_job_qt.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ void URLRequestQrcJobQt::startGetHead()
120120
QMimeType mimeType = mimeDatabase.mimeTypeForFile(qrcFileInfo);
121121
m_mimeType = mimeType.name().toStdString();
122122
// Open file
123-
if (m_file.open(QIODevice::ReadOnly)) {
123+
if (m_file.open(QIODevice::ReadOnly) && m_file.size() > 0) {
124124
m_remainingBytes = m_file.size();
125125
set_expected_content_size(m_remainingBytes);
126126
// Notify that the headers are complete
127127
NotifyHeadersComplete();
128-
} else {
129-
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, ERR_INVALID_URL));
128+
return;
130129
}
130+
qWarning("Resource %s not found or is empty", qUtf8Printable(qrcFilePath));
131+
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, ERR_INVALID_URL));
131132
}
132-
133133
} // namespace QtWebEngineCore

0 commit comments

Comments
 (0)