diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d83a68389..ea7c3e000 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -330,6 +330,7 @@ Roger Vaughn
 Roman Ivashin
 Ronen Mashal
 Russell Gold
+Ryan Bennitt
 Sam Ruby
 Sandra Metz
 Scott Carlson
diff --git a/WHATSNEW b/WHATSNEW
index e6a0b1b34..ea3f75a0f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -55,6 +55,11 @@ Fixed bugs:
  * complete-ant-cmd.pl now also knows about the -file option.
    Bugzilla Report 57371
 
+ * the br-replace template inside the XSLT stylesheets used by
+   <junitreport> could cause stack overflows or out-of-memory errors
+   when applied to big outputs.
+   Bugzilla Report 57341
+
 Other changes:
 --------------
 
diff --git a/contributors.xml b/contributors.xml
index 3ce31a53e..ae1e6fc48 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -1333,6 +1333,10 @@
     <first>Russell</first>
     <last>Gold</last>
   </name>
+  <name>
+    <first>Ryan</first>
+    <last>Bennitt</last>
+  </name>
   <name>
     <first>Sam</first>
     <last>Ruby</last>
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 25fcf1fb3..afea6e015 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -929,7 +929,24 @@ h6 {
 -->
 <xsl:template name="br-replace">
     <xsl:param name="word"/>
+    <xsl:param name="splitlimit">32</xsl:param>
+    <xsl:variable name="secondhalflen" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalflen)"/>
+    <!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
     <xsl:choose>
+      <xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '&#xa;'))">
+        <xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '&#xa;')"/>
+        <xsl:variable name="firsthalflen" select="string-length($word) - $secondhalflen"/>
+        <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
+        <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="concat($firsthalfword,$firsthalfend)"/>
+        </xsl:call-template>
+        <br/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="$secondhalfend"/>
+        </xsl:call-template>
+      </xsl:when>
       <xsl:when test="contains($word, '&#xa;')">
         <xsl:value-of select="substring-before($word, '&#xa;')"/>
         <br/>
@@ -938,7 +955,7 @@ h6 {
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:value-of select="$word"/>
+        <xsl:value-of select="$word"/>
       </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index ab9e143e0..bd7002a96 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -469,7 +469,24 @@
 -->
 <xsl:template name="br-replace">
     <xsl:param name="word"/>
+    <xsl:param name="splitlimit">32</xsl:param>
+    <xsl:variable name="secondhalflen" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalflen)"/>
+    <!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
     <xsl:choose>
+      <xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '&#xa;'))">
+        <xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '&#xa;')"/>
+        <xsl:variable name="firsthalflen" select="string-length($word) - $secondhalflen"/>
+        <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
+        <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="concat($firsthalfword,$firsthalfend)"/>
+        </xsl:call-template>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="$secondhalfend"/>
+        </xsl:call-template>
+      </xsl:when>
       <xsl:when test="contains($word, '&#xa;')">
         <xsl:value-of select="substring-before($word, '&#xa;')"/>
         <br/>
@@ -478,7 +495,7 @@
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:value-of select="$word"/>
+        <xsl:value-of select="$word"/>
       </xsl:otherwise>
     </xsl:choose>
 </xsl:template>