|
 |
4fe1d2 |
commit 3b15963316b59cd1af3468a43535d90343916ffb
|
|
|
4fe1d2 |
Author: Dimitri van Heesch <doxygen@gmail.com>
|
|
|
4fe1d2 |
Date: Mon Jan 18 19:59:16 2021 +0100
|
|
|
4fe1d2 |
|
|
|
4fe1d2 |
issue #8343: doxygen-1.9.1 crashes when parsing config file
|
|
|
4fe1d2 |
|
|
|
4fe1d2 |
diff --git a/src/configimpl.l b/src/configimpl.l
|
|
|
4fe1d2 |
index 7f73ec01..56a2e108 100644
|
|
|
4fe1d2 |
--- a/src/configimpl.l
|
|
|
4fe1d2 |
+++ b/src/configimpl.l
|
|
|
4fe1d2 |
@@ -1210,7 +1210,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
|
|
4fe1d2 |
c=result.at(i);
|
|
|
4fe1d2 |
if (c=='"') // end quote
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
- results.push_back(result.mid(p,i-p).data());
|
|
|
4fe1d2 |
+ results.push_back(result.mid(p,i-p).str());
|
|
|
4fe1d2 |
p=i+1;
|
|
|
4fe1d2 |
break;
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
@@ -1222,7 +1222,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
else if (c==' ' || c=='\t') // separator
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
- if (i>p) results.push_back(result.mid(p,i-p).data());
|
|
|
4fe1d2 |
+ if (i>p) results.push_back(result.mid(p,i-p).str());
|
|
|
4fe1d2 |
p=i+1;
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
@@ -1234,7 +1234,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
else // just goto the next element in the list
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
- if (!result.isEmpty()) results.push_back(result.data());
|
|
|
4fe1d2 |
+ if (!result.isEmpty()) results.push_back(result.str());
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
sl = results;
|
|
|
4fe1d2 |
@@ -1409,7 +1409,7 @@ static void cleanUpPaths(StringVector &str)
|
|
|
4fe1d2 |
QFileInfo fi(path.c_str());
|
|
|
4fe1d2 |
if (fi.exists() && fi.isDir())
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
- path = fi.absFilePath().utf8().data();
|
|
|
4fe1d2 |
+ path = fi.absFilePath().utf8().str();
|
|
|
4fe1d2 |
if (path[path.size()-1]!='/') path+='/';
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
@@ -1545,7 +1545,7 @@ void Config::checkAndCorrect()
|
|
|
4fe1d2 |
QString p = QDir::currentDirPath();
|
|
|
4fe1d2 |
if (p.at(p.length()-1)!='/')
|
|
|
4fe1d2 |
p.append('/');
|
|
|
4fe1d2 |
- stripFromPath.push_back(p.utf8().data());
|
|
|
4fe1d2 |
+ stripFromPath.push_back(p.utf8().str());
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
else
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
@@ -1882,7 +1882,7 @@ void Config::checkAndCorrect()
|
|
|
4fe1d2 |
if (inputSources.empty())
|
|
|
4fe1d2 |
{
|
|
|
4fe1d2 |
// use current dir as the default
|
|
|
4fe1d2 |
- inputSources.push_back(QDir::currentDirPath().utf8().data());
|
|
|
4fe1d2 |
+ inputSources.push_back(QDir::currentDirPath().utf8().str());
|
|
|
4fe1d2 |
}
|
|
|
4fe1d2 |
else
|
|
|
4fe1d2 |
{
|