1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-23 07:28:26 +01:00
slackware-current/source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch
Patrick J Volkerding 0a66130671 Fri Mar 12 23:01:08 UTC 2021
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.
2021-03-13 08:59:53 +01:00

22 lines
977 B
Diff

diff -up doxygen/src/configimpl.l.orig doxygen/src/configimpl.l
--- doxygen/src/configimpl.l.orig 2021-01-19 17:25:00.933789247 +0100
+++ doxygen/src/configimpl.l 2021-01-19 17:26:09.704744240 +0100
@@ -1175,8 +1175,7 @@ static void substEnvVarsInStrList(String
for (const auto &s : sl)
{
QCString result = s.c_str();
- // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
- bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
+ bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1) || (result.find('"')!=-1);
// here we strip the quote again
substEnvVarsInString(result);
@@ -1229,7 +1228,7 @@ static void substEnvVarsInStrList(String
}
if (p!=l) // add the leftover as a string
{
- results.push_back(result.right(l-p).data());
+ results.push_back(result.right(l-p).str());
}
}
else // just goto the next element in the list