diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-04 17:39:41 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-09 08:44:07 +0000 |
| commit | ca220513039fc725eccf45e1bdc5b6436f79eb24 (patch) | |
| tree | e62d96d96d8b72beff1d3dc852d75ecf3bab40cf /src/libs/qmljs/qmljsutils.cpp | |
| parent | 8d15633a22d5fb72db3342626e001bfbcf0e0d7b (diff) | |
QmlJS: Avoid infinite loop on empty list of import paths
Change-Id: I1b7bade71226e4181b2643cabb53f934930afc81
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'src/libs/qmljs/qmljsutils.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsutils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsutils.cpp b/src/libs/qmljs/qmljsutils.cpp index 98deff530ac..a3ebed5081c 100644 --- a/src/libs/qmljs/qmljsutils.cpp +++ b/src/libs/qmljs/qmljsutils.cpp @@ -232,6 +232,8 @@ QString QmlJS::modulePath(const QString &name, const QString &version, const QStringList &importPaths) { Q_ASSERT(maybeModuleVersion(version)); + if (importPaths.isEmpty()) + return QString(); const QStringList parts = name.split(QLatin1Char('.'), QString::SkipEmptyParts); auto mkpath = [] (const QStringList &xs) -> QString { return xs.join(QLatin1Char('/')); }; |