]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
docbook-xsl: Add patch to fix problematic recursed strings.
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 26 Feb 2023 13:28:38 +0000 (14:28 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Feb 2023 12:46:51 +0000 (12:46 +0000)
This fixes the following error messages:
xsltApplySequenceConstructor: A potential infinite template recursion was detected.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
docbook-xsl/docbook-xsl.nm
docbook-xsl/patches/765567_non-recursive_string_subst.patch2 [new file with mode: 0644]

index f3a7a11b24a6d9510ce7b8407742efddee9c314d..c1c5caf3c6855b1a84bfc009f926e6dc08813f4c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = docbook-xsl
 version    = 1.79.2
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Applications/Text
diff --git a/docbook-xsl/patches/765567_non-recursive_string_subst.patch2 b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2
new file mode 100644 (file)
index 0000000..ae845ad
--- /dev/null
@@ -0,0 +1,32 @@
+Description: use EXSLT "replace" function when available
+ A recursive implementation  of string.subst is problematic,
+ long strings with many matches will cause stack overflows.
+Author: Peter De Wachter <pdewacht@gmail.com>
+Bug-Debian: https://bugs.debian.org/750593
+
+--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
++++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
+@@ -6,7 +6,11 @@
+      This module implements DTD-independent functions
+-     ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++     ******************************************************************** -->
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:str="http://exslt.org/strings"
++                exclude-result-prefixes="str"
++                version="1.0">
+ <xsl:template name="dot.count">
+   <!-- Returns the number of "." characters in a string -->
+@@ -52,6 +56,9 @@
+   <xsl:param name="replacement"/>
+   <xsl:choose>
++    <xsl:when test="function-available('str:replace')">
++      <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++    </xsl:when>
+     <xsl:when test="contains($string, $target)">
+       <xsl:variable name="rest">
+         <xsl:call-template name="string.subst">
+