rpms/doxygen
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/doxygen.git#4ff8429b2cdd863decbca8f8c9629b5d74a54036
This commit is contained in:
DistroBaker 2021-01-20 11:37:20 +00:00
parent 0a871fafc3
commit 6488c151be
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doxgen-1.9.1-crash-when-parsing-config-file-part2.patch Normal file
View File

@ -0,0 +1,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

7
doxygen.spec
View File

@ -16,7 +16,7 @@ Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.9.1
Release: 2%{?dist}
Release: 3%{?dist}
# No version is specified.
License: GPL+
@ -28,6 +28,7 @@ Source1: doxywizard.desktop
Source2: doxywizard-icons.tar.xz
# upstream patches
Patch1: doxgen-1.9.1-crash-when-parsing-config-file.patch
Patch2: doxgen-1.9.1-crash-when-parsing-config-file-part2.patch
BuildRequires: %{_bindir}/python3
BuildRequires: gcc-c++ gcc
@ -301,6 +302,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%endif
%changelog
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-3
- fixed doxygen crashes when parsing config file part2
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-2
- fixed bz#1916161, crashes when parsing config file