diff mbox series

docbook-xsl: Add patch to fix problematic recursed strings.

Message ID 20230226132838.380708-1-stefan.schantl@ipfire.org
State Accepted
Commit 2d0e2d4408a62c229730263cce04f8ea5336d06d
Headers
Series docbook-xsl: Add patch to fix problematic recursed strings. |

Commit Message

Stefan Schantl Feb. 26, 2023, 1:28 p.m. UTC 
  This fixes the following error messages:
xsltApplySequenceConstructor: A potential infinite template recursion was detected.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 docbook-xsl/docbook-xsl.nm                    |  2 +-
 .../765567_non-recursive_string_subst.patch2  | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 docbook-xsl/patches/765567_non-recursive_string_subst.patch2
diff mbox series

Patch

diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm
index f3a7a11b2..c1c5caf3c 100644
--- a/docbook-xsl/docbook-xsl.nm
+++ b/docbook-xsl/docbook-xsl.nm
@@ -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
index 000000000..ae845ad00
--- /dev/null
+++ b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2
@@ -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">
+