summaryrefslogtreecommitdiffstats
path: root/source/d/doxygen/patches/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch
blob: 38465ffb84545d80e6d6a307d20e40d6bd28577a (about) (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
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