From 7cd2026fa2d887f4a3694ff9c3203686bf418d5c Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 16 Jan 2023 13:21:04 +0100 Subject: [PATCH] Utils: Re-add some safety net in FilePath::setPath() Amends c08317b5a673b7bb57de9a6801169975a3dc80ef Change-Id: I3b9bc61346aa60280beb3b29c33c0f76017e407a Reviewed-by: Christian Stenger --- src/libs/utils/filepath.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index b71b4e6c752..c100ef70471 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -877,11 +877,22 @@ void FilePath::setPath(QStringView path) setParts(scheme(), host(), path); } -void FilePath::setFromString(const QStringView fileNameView) +void FilePath::setFromString(QStringView fileNameView) { static const QStringView qtcDevSlash(u"__qtc_devices__/"); static const QStringView colonSlashSlash(u"://"); +#if 1 + // FIXME: Remove below once the calling code is adjusted + QString dummy; + if (fileNameView.contains(u'\\')) { + QTC_CHECK(false); + dummy = fileNameView.toString(); + dummy.replace('\\', '/'); + fileNameView = dummy; + } +#endif + const QChar slash('/'); bool startsWithQtcSlashDev = false;