0f72f05238
Fixes <https://bugs.gnu.org/29782>. Reported by Gábor Boskovits. * gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/docbook.scm (docbook-xsl)[source](patches): Use it. [native-inputs]: Add XZ. [arguments]: Adjust PATH accordingly.
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
Use a non-recursive replace function when the parser supports it.
|
|
|
|
https://bugs.gnu.org/29782
|
|
https://bugzilla.samba.org/show_bug.cgi?id=9515
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=736077 (for xsltproc)
|
|
|
|
Patch copied from Debian:
|
|
https://anonscm.debian.org/cgit/collab-maint/docbook-xsl.git/tree/debian/patches/765567_non-recursive_string_subst.patch
|
|
|
|
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
|
|
|
|
--- a/lib/lib.xsl
|
|
+++ b/lib/lib.xsl
|
|
@@ -10,7 +10,10 @@
|
|
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 -->
|
|
@@ -56,6 +59,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">
|