Accepting request 181905 from devel:tools

- upstream patch to fix endless loop
  doxygen-1.4.8-endless-loop.patch (forwarded request 181899 from k0da)

OBS-URL: https://build.opensuse.org/request/show/181905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2013-07-04 08:08:13 +00:00 committed by Git OBS Bridge
commit c8f8ca7ad2
3 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,27 @@
commit 5e056236c9ef3b3675d014cab43480700027d60b
Author: Dimitri van Heesch <dimitri@stack.nl>
Date: Thu May 30 20:01:15 2013 +0200
Bug 701295 - Doxygen 1.8.4 goes into an endless loop
diff --git a/src/util.cpp b/src/util.cpp
index 0d70d43..0c36fc0 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name)
++templateDepth;
pos=nextOpenPos-1;
}
- else
+ else if (nextClosePos!=-1)
{
--templateDepth;
pos=nextClosePos-1;
}
+ else // more >'s than <'s, see bug701295
+ {
+ return -1;
+ }
}
else
{

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 3 15:36:53 UTC 2013 - dvaleev@suse.com
- upstream patch to fix endless loop
doxygen-1.4.8-endless-loop.patch
-------------------------------------------------------------------
Mon May 20 16:41:54 UTC 2013 - pgajdos@suse.com

View File

@ -37,6 +37,7 @@ Patch: %{name}-1.5.9-64archs.patch
Patch3: %{name}-1.5.9-man.patch
Patch4: %{name}-1.7.0-modify_footer.patch
Patch5: %{name}-no-lowercase-man-names.patch
Patch6: %{name}-1.4.8-endless-loop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
@ -71,6 +72,7 @@ as well. An executable for Windows 95/NT is also available.
%patch3
%patch4
%patch5 -p1
%patch6 -p1
cp -v %{S:3} .
/usr/bin/unzip %{S:3}