From 0d1928a584368ec7c51f0fd1c0dc77b7fe7b8251 Mon Sep 17 00:00:00 2001
From: Jeffrey Adamson <jwadamson@us.ibm.com>
Date: Fri, 28 Oct 2016 11:29:32 -0400
Subject: [PATCH 1/3] corrected comments

---
 src/script/ant | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/script/ant b/src/script/ant
index 0f83e183f..5d1d15483 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -50,13 +50,13 @@ for arg in "$@" ; do
 
     # wrap all arguments as "" strings, escape any internal back-slash, double-quote, $, or back-tick characters
     #  use printf to avoid echo interpretation behaviors such as escapes and line continuation
-    #  pad the value with leading/trailing X to protect whitespace
+    #  pad the value with X to protect leading/trailing whitespace from subshell output trimming
     esc_arg="X${arg}X"
     case "$esc_tool" in
       'sed')
         # Mac bsd_sed does not support group-0, so pattern uses group-1
         # Solaris sed only proceses lines with trailing newline, passing in an extra newline
-        # sed will consume the trailing newline
+        # subshell assignment will trim the added trailing newline
         esc_arg="$(printf '%s\n' "$esc_arg" | sed -e 's@\([$"\\`]\)@\\\1@g')"
         ;;
       'awk')

From 9eef94a6fc053ee01028fe439149b4a2c4f2fb89 Mon Sep 17 00:00:00 2001
From: barney2k7 <barney2k7@gmail.com>
Date: Tue, 6 Dec 2016 15:25:41 +0100
Subject: [PATCH 2/3] Bug 58661: avoid duplicate characters in stack traces

The problem was that $secondhalflen is actually less than
string-length($secondhalfword) in case the number of chars in word is
even. This leads to $firsthalflen being calculated too long, resulting
in a duplicated character.
---
 src/etc/junit-frames.xsl   | 6 +++---
 src/etc/junit-noframes.xsl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index afea6e015..624fd6923 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -930,13 +930,13 @@ 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)"/>
+    <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
     <!-- 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="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
         <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
         <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
         <xsl:call-template name="br-replace">
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index bd7002a96..fa3ac3e96 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -470,13 +470,13 @@
 <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)"/>
+    <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
     <!-- 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="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
         <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
         <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
         <xsl:call-template name="br-replace">

From 8925f08bea2210eeab0ec1a8e7aa631d0a2d7c32 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 6 Dec 2016 17:04:52 +0100
Subject: [PATCH 3/3] Bugzilla 58661: record fix by barney2k7

closes #27
---
 WHATSNEW | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WHATSNEW b/WHATSNEW
index ae039033f..b7537bdd4 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -56,6 +56,10 @@ Fixed bugs:
    command line.
    Bugzilla Report 60150, 59445
 
+ * The report generated by <junitreport> could contain duplicate
+   characters in stack traces.
+   Bugzilla Report 58661
+
 Other changes:
 --------------