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

protect against circular inclusion of pro/pri files

Browse Source 
Task-number: 250574
This commit is contained in:
Oswald Buddenhagen
2009-04-14 15:31:07 +02:00
parent 99fccb6d37
commit 870a3b3903
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/proparser/profileevaluator.cpp
View File

@@ -2024,7 +2024,13 @@ ProFile *ProFileEvaluator::parsedProFile(const QString &fileName)
{ {
QFileInfo fi(fileName); QFileInfo fi(fileName);
if (fi.exists()) { if (fi.exists()) {
ProFile *pro = new ProFile(fi.absoluteFilePath()); QString fn = QDir::cleanPath(fi.absoluteFilePath());
foreach (const ProFile *pf, d->m_profileStack)
if (pf->fileName() == fn) {
errorMessage(d->format("circular inclusion of %1").arg(fn));
return 0;
}
ProFile *pro = new ProFile(fn);
if (d->read(pro)) if (d->read(pro))
return pro; return pro;
delete pro; delete pro;