summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-14 12:35:32 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-15 18:38:58 (GMT)
commit443f9389f65b05699a10449afc774da3e816f3d1 (patch)
tree9eb1065b51f1b7ce1362e384d5aa861c11ae1055 /tools
parenta089be0d09c64e698d2fa404cf5eedb21dde6406 (diff)
downloadQt-443f9389f65b05699a10449afc774da3e816f3d1.zip
Qt-443f9389f65b05699a10449afc774da3e816f3d1.tar.gz
Qt-443f9389f65b05699a10449afc774da3e816f3d1.tar.bz2
do not crash on lines starting with an equal sign
Diffstat (limited to 'tools')
-rw-r--r--tools/linguist/shared/profileevaluator.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index ce53c27..98929c0 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -275,6 +275,9 @@ void ProFileEvaluator::Private::insertVariable(const QString &line, int *i)
{
ProVariable::VariableOperator opkind;
+ if (m_proitem.isEmpty()) // Line starting with '=', like a conflict marker
+ return;
+
switch (m_proitem.at(m_proitem.length() - 1).unicode()) {
case '+':
m_proitem.chop(1);