diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-10 14:17:01 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-10 17:01:49 +0200 |
| commit | 6a832f5474d3b4f789e4bcdebcd425e5ec98423f (patch) | |
| tree | 372a5f0f688eb90e4e51d096fc7b81d278de0489 | |
| parent | 089da2d1fd40a0e827e985f1893c8ea8c2823759 (diff) | |
| download | qttools-6a832f5474d3b4f789e4bcdebcd425e5ec98423f.tar.gz | |
lrelease: Fix crash on projects without TRANSLATIONS assignment
Add missing nullptr check.
Fixes: QTBUG-76930
Change-Id: I2dc99db43b12cebc6fbe9024057ba963e0ae470f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/linguist/lrelease/main.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/linguist/lrelease/testdata/no-translations.pro | 1 | ||||
| -rw-r--r-- | tests/auto/linguist/lrelease/tst_lrelease.cpp | 12 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 7ef9afe1f..7033f9eb9 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -180,7 +180,9 @@ static QStringList translationsFromProjects(const Projects &projects, bool topLe static QStringList translationsFromProject(const Project &project, bool topLevel) { - QStringList result = *project.translations; + QStringList result; + if (project.translations) + result = *project.translations; result << translationsFromProjects(project.subProjects, false); if (topLevel && result.isEmpty()) { printErr(LR::tr("lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1'\n") diff --git a/tests/auto/linguist/lrelease/testdata/no-translations.pro b/tests/auto/linguist/lrelease/testdata/no-translations.pro new file mode 100644 index 000000000..154b26628 --- /dev/null +++ b/tests/auto/linguist/lrelease/testdata/no-translations.pro @@ -0,0 +1 @@ +TEMPLATE = app diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp index 19ed47f52..d392e51db 100644 --- a/tests/auto/linguist/lrelease/tst_lrelease.cpp +++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp @@ -51,6 +51,7 @@ private slots: void idbased(); void markuntranslated(); void dupes(); + void noTranslations(); private: void doCompare(const QStringList &actual, const QString &expectedFn); @@ -207,5 +208,16 @@ void tst_lrelease::dupes() doCompare(QString(proc.readAllStandardError()).trimmed().split('\n'), dataDir + "dupes.errors"); } +void tst_lrelease::noTranslations() +{ + QProcess proc; + proc.start(lrelease, { dataDir + "no-translations.pro" }); + QVERIFY(proc.waitForFinished()); + QCOMPARE(proc.exitStatus(), QProcess::NormalExit); + QCOMPARE(proc.exitCode(), 0); + auto stderrOutput = proc.readAllStandardError(); + QVERIFY(stderrOutput.contains("lrelease warning: Met no 'TRANSLATIONS' entry in project file")); +} + QTEST_MAIN(tst_lrelease) #include "tst_lrelease.moc" |