feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't use fromRawData() for the file name parts.

Browse Source 
the sub-strings "escaped" from the evaluator through the accessor, so
things did go boom, after all.

Reviewed-by: thorbjorn
(cherry picked from commit 2113669fba)
This commit is contained in:
Oswald Buddenhagen
2010-04-19 18:18:03 +02:00
committed by con
parent 8e3c9fa10d
commit 04a5b9137a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/proparser/proitems.cpp
View File

@@ -61,11 +61,10 @@ ProFile::ProFile(const QString &fileName)
setBlockKind(ProBlock::ProFileKind); setBlockKind(ProBlock::ProFileKind);
m_fileName = fileName; m_fileName = fileName;
// If the full name does not outlive the parts, things will go boom ...
int nameOff = fileName.lastIndexOf(QLatin1Char('/')); int nameOff = fileName.lastIndexOf(QLatin1Char('/'));
m_displayFileName = QString::fromRawData(fileName.constData() + nameOff + 1, m_displayFileName = QString(fileName.constData() + nameOff + 1,
fileName.length() - nameOff - 1); fileName.length() - nameOff - 1);
m_directoryName = QString::fromRawData(fileName.constData(), nameOff); m_directoryName = QString(fileName.constData(), nameOff);
} }
QT_END_NAMESPACE QT_END_NAMESPACE