From b60b2c5fc5f015192e73f5471eb28ba83b99cc56 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 23 Mar 2018 22:28:30 +0100 Subject: QTextBrowser: do not try to open file with empty filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When loading a resource from a href link, the link is not necessarily a local filename. In this case QTextBrowserPrivate::findFile() returns an empty filename which will create a warning when trying to open it. Task-number: QTBUG-43270 Change-Id: I39803afe3db9da0bfe2aaab86a5ebb6ed4b7c732 Reviewed-by: Thorbjørn Lund Martsum Reviewed-by: Richard Moe Gustavsen --- src/widgets/widgets/qtextbrowser.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index fa4dd14c92..b1cb556505 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -163,6 +163,9 @@ QString QTextBrowserPrivate::findFile(const QUrl &name) const fileName = name.toLocalFile(); } + if (fileName.isEmpty()) + return fileName; + if (QFileInfo(fileName).isAbsolute()) return fileName; @@ -1089,6 +1092,8 @@ QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name) QByteArray data; QString fileName = d->findFile(d->resolveUrl(name)); + if (fileName.isEmpty()) + return QVariant(); QFile f(fileName); if (f.open(QFile::ReadOnly)) { data = f.readAll(); -- cgit v1.2.3