From 8636afea549c3bd66cac25fc6a614a4d00ac35dd66f58c1dad6a4946d262e745 Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Wed, 3 Jul 2013 15:56:31 +0000 Subject: [PATCH] Accepting request 181899 from home:k0da:ppc - upstream patch to fix endless loop doxygen-1.4.8-endless-loop.patch OBS-URL: https://build.opensuse.org/request/show/181899 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=65 --- doxygen-1.4.8-endless-loop.patch | 27 +++++++++++++++++++++++++++ doxygen.changes | 6 ++++++ doxygen.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 doxygen-1.4.8-endless-loop.patch diff --git a/doxygen-1.4.8-endless-loop.patch b/doxygen-1.4.8-endless-loop.patch new file mode 100644 index 0000000..a6b4024 --- /dev/null +++ b/doxygen-1.4.8-endless-loop.patch @@ -0,0 +1,27 @@ +commit 5e056236c9ef3b3675d014cab43480700027d60b +Author: Dimitri van Heesch +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 + { diff --git a/doxygen.changes b/doxygen.changes index 1e01008..b1799dd 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -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 diff --git a/doxygen.spec b/doxygen.spec index 3e05f55..059fd62 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -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}