feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Use simplistic percentencoding for host parts of FilePath

Browse Source 
Host parts with true slashes (as possible currently for docker ids
using the repo:tag style) breaks parsing in FilePath::fromString.

This provides a means to use such names nevertheless.

Task-number: QTCREATORBUG-26856
Change-Id: Iba3568c5708fe495d0dd657540f30a2519e7f45f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-02-24 16:00:58 +01:00
parent f334bd422e
commit 4ca780ccb3
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/filepath.cpp
View File

@@ -454,14 +454,21 @@ FilePath FilePath::fromUrl(const QUrl &url)
return fn;
}
static QString hostEncoded(QString host)
{
host.replace('%', "%25");
host.replace('/', "%2f");
return host;
}
/// \returns a QString for passing on to QString based APIs
QString FilePath::toString() const
{
if (m_scheme.isEmpty())
return m_data;
if (m_data.startsWith('/'))
return m_scheme + "://" + m_host + m_data;
return m_scheme + "://" + m_host + "/./" + m_data;
return m_scheme + "://" + hostEncoded(m_host) + m_data;
return m_scheme + "://" + hostEncoded(m_host) + "/./" + m_data;
}
QUrl FilePath::toUrl() const
@@ -595,7 +602,6 @@ void FilePath::setScheme(const QString &scheme)
void FilePath::setHost(const QString &host)
{
QTC_CHECK(!host.contains('/'));
m_host = host;
}
@@ -943,6 +949,8 @@ void FilePath::setFromString(const QString &filename)
m_data = filename.mid(pos1);
} else {
m_host = filename.mid(pos1, pos2 - pos1);
m_host.replace("%2f", "/");
m_host.replace("%25", "%");
m_data = filename.mid(pos2);
}
if (m_data.startsWith("/./"))