summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-12-22 13:39:28 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-12-22 13:39:28 (GMT)
commit462f5148a3be5835cc8d5b69685473042789c917 (patch)
tree669a9ef740d0a7ecc0d9999f8b4dfdebcd9bb68a
parent07bc01460e72f08550f09de66e0e716471cf61bd (diff)
downloadQt-462f5148a3be5835cc8d5b69685473042789c917.zip
Qt-462f5148a3be5835cc8d5b69685473042789c917.tar.gz
Qt-462f5148a3be5835cc8d5b69685473042789c917.tar.bz2
Fix infinite loop in qmake when reading malformed .ts files.
No checking for the end of xml file was done in while loop looking for TS element. Task-number: QTBUG-16261 Reviewed-by: Janne Koskinen
-rw-r--r--qmake/generators/symbian/symbiancommon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 602bcc2..d9f12b3 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -977,7 +977,7 @@ bool SymbianCommonGenerator::parseTsContent(const QString &tsFilename, SymbianLo
QXmlStreamReader xml(&tsFile);
- while (xml.name() != tsElement)
+ while (!xml.atEnd() && xml.name() != tsElement)
xml.readNextStartElement();
while (xml.readNextStartElement()) {