diff --git a/doxygen-guard-null-variable.patch b/doxygen-guard-null-variable.patch new file mode 100644 index 0000000..98a5e07 --- /dev/null +++ b/doxygen-guard-null-variable.patch @@ -0,0 +1,25 @@ +From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 +From: albert-github +Date: Wed, 4 Jan 2017 12:24:55 +0100 +Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the + breathe docs + +Protected against NULL pointer of variable al +--- + src/xmlgen.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp +index fe95c7a..70e198a 100644 +--- a/src/xmlgen.cpp ++++ b/src/xmlgen.cpp +@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De + if (md->isInline()) t << "yes"; else t << "no"; + t << "\""; + +- if (al->refQualifier!=RefQualifierNone) ++ if (al!=0 && al->refQualifier!=RefQualifierNone) + { + t << " refqual=\""; + if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue"; + diff --git a/doxygen.changes b/doxygen.changes index b58a689..4c7800b 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 20 17:51:08 UTC 2017 - dimstar@opensuse.org + +- Add doxygen-guard-null-variable.patch: Protected against NULL + pointer of variable al, upstream commit 0f02761. + ------------------------------------------------------------------- Tue Feb 14 08:10:21 UTC 2017 - foss@grueninger.de diff --git a/doxygen.spec b/doxygen.spec index 2f11948..107277c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -34,6 +34,8 @@ Patch3: vhdlparser-no-return.patch Patch4: doxygen-dot-one-thread.patch # Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672 Patch6: res2cc_sort_resources.diff +# PATCH-FIX-UPSTREAM doxygen-guard-null-variable.patch gh#doxygen/doxygen#555 dimstar@opensuse.org -- Protected against NULL pointer of variable al +Patch7: doxygen-guard-null-variable.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -59,6 +61,7 @@ as well. %patch4 -p1 %endif %patch6 -p0 +%patch7 -p1 %build export CFLAGS="%{optflags} -fPIC"