diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-03-12 23:01:08 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-03-13 08:59:53 +0100 |
commit | 0a66130671273f398ed342efd6fbdfd342d89818 (patch) | |
tree | 9cdacca3d25517b2074dc5f34a88812ec81b9cb3 /source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch | |
parent | 913fae06e0ae428cf46ebd3dc23dbf384d42b20b (diff) | |
download | current-0a66130671273f398ed342efd6fbdfd342d89818.tar.gz current-0a66130671273f398ed342efd6fbdfd342d89818.tar.xz |
Fri Mar 12 23:01:08 UTC 202120210312230108
a/acl-2.3.0-x86_64-1.txz: Upgraded.
a/attr-2.5.0-x86_64-1.txz: Upgraded.
ap/hplip-3.20.5-x86_64-3.txz: Rebuilt.
Switched to hplip-3.20.5 to fix regressions in the hp-plugin subsystem.
Patched to use is_alive() rather than the deprecated isAlive().
Thanks to Andypoo.
Newer versions than 3.20.6 require avahi. We'll stick with this version
for now and leave the decision about whether we love HP more than we hate
avahi for another day.
d/doxygen-1.9.1-x86_64-1.txz: Upgraded.
xap/mozilla-firefox-78.8.0esr-x86_64-2.txz: Rebuilt.
Rebuilt with --enable-system-nss and --enable-system-nspr. Thanks to franzen.
xap/mozilla-thunderbird-78.8.1-x86_64-2.txz: Rebuilt.
Rebuilt with --enable-system-nss, --enable-system-nspr, and
--disable-debug-symbols. Thanks to franzen.
xap/seamonkey-2.53.6-x86_64-3.txz: Rebuilt.
Rebuilt with --enable-system-nss and --enable-system-nspr. Thanks to franzen.
xfce/exo-4.16.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch')
-rw-r--r-- | source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch b/source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch new file mode 100644 index 000000000..848750d64 --- /dev/null +++ b/source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file.patch @@ -0,0 +1,64 @@ +commit 3b15963316b59cd1af3468a43535d90343916ffb +Author: Dimitri van Heesch <doxygen@gmail.com> +Date: Mon Jan 18 19:59:16 2021 +0100 + + issue #8343: doxygen-1.9.1 crashes when parsing config file + +diff --git a/src/configimpl.l b/src/configimpl.l +index 7f73ec01..56a2e108 100644 +--- a/src/configimpl.l ++++ b/src/configimpl.l +@@ -1210,7 +1210,7 @@ static void substEnvVarsInStrList(StringVector &sl) + c=result.at(i); + if (c=='"') // end quote + { +- results.push_back(result.mid(p,i-p).data()); ++ results.push_back(result.mid(p,i-p).str()); + p=i+1; + break; + } +@@ -1222,7 +1222,7 @@ static void substEnvVarsInStrList(StringVector &sl) + } + else if (c==' ' || c=='\t') // separator + { +- if (i>p) results.push_back(result.mid(p,i-p).data()); ++ if (i>p) results.push_back(result.mid(p,i-p).str()); + p=i+1; + } + } +@@ -1234,7 +1234,7 @@ static void substEnvVarsInStrList(StringVector &sl) + } + else // just goto the next element in the list + { +- if (!result.isEmpty()) results.push_back(result.data()); ++ if (!result.isEmpty()) results.push_back(result.str()); + } + } + sl = results; +@@ -1409,7 +1409,7 @@ static void cleanUpPaths(StringVector &str) + QFileInfo fi(path.c_str()); + if (fi.exists() && fi.isDir()) + { +- path = fi.absFilePath().utf8().data(); ++ path = fi.absFilePath().utf8().str(); + if (path[path.size()-1]!='/') path+='/'; + } + } +@@ -1545,7 +1545,7 @@ void Config::checkAndCorrect() + QString p = QDir::currentDirPath(); + if (p.at(p.length()-1)!='/') + p.append('/'); +- stripFromPath.push_back(p.utf8().data()); ++ stripFromPath.push_back(p.utf8().str()); + } + else + { +@@ -1882,7 +1882,7 @@ void Config::checkAndCorrect() + if (inputSources.empty()) + { + // use current dir as the default +- inputSources.push_back(QDir::currentDirPath().utf8().data()); ++ inputSources.push_back(QDir::currentDirPath().utf8().str()); + } + else + { |