[Openvas-commits] r11548 - in trunk/openvas-manager: . src/report_formats/LaTeX

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-09-02 11:43:04 +0200 (Fri, 02 Sep 2011)
New Revision: 11548

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/report_formats/LaTeX/latex.xsl
Log:
* src/report_formats/LaTeX/latex.xsl: Correct two typos in the
  escaping functions which could cause the output to be mangled in case
  a $ or {} was contained in strings the escape_text template was called
  upon. Patch suggested by Andre Heinecke.


Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-09-01 19:09:35 UTC (rev 11547)
+++ trunk/openvas-manager/ChangeLog	2011-09-02 09:43:04 UTC (rev 11548)
@@ -1,3 +1,10 @@
+2011-09-02  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* src/report_formats/LaTeX/latex.xsl: Correct two typos in the
+	escaping functions which could cause the output to be mangled in case
+	a $ or {} was contained in strings the escape_text template was called
+	upon. Patch suggested by Andre Heinecke.
+
 2011-09-01  Henri Doreau <henri.doreau at greenbone.net>
 
 	Created a `tools' directory with files required for SCAP data

Modified: trunk/openvas-manager/src/report_formats/LaTeX/latex.xsl
===================================================================
--- trunk/openvas-manager/src/report_formats/LaTeX/latex.xsl	2011-09-01 19:09:35 UTC (rev 11547)
+++ trunk/openvas-manager/src/report_formats/LaTeX/latex.xsl	2011-09-02 09:43:04 UTC (rev 11548)
@@ -232,7 +232,7 @@
       <xsl:when test="contains($string, '\') or contains($string, '$')">
         <xsl:variable name="before_backslash" select="substring-before($string, '\')"/>
         <xsl:variable name="before_dollar" select="substring-before($string, '$')"/>
-        <xsl:variable name="strlen_before_backslash" select="string-length($before_dollar)"/>
+        <xsl:variable name="strlen_before_backslash" select="string-length($before_backslash)"/>
         <xsl:variable name="strlen_before_dollar" select="string-length($before_dollar)"/>
         <xsl:choose>
           <xsl:when test="$strlen_before_dollar &gt; 0 and $strlen_before_backslash &gt; 0">
@@ -334,7 +334,7 @@
     <xsl:variable name="string_replace7">
       <xsl:call-template name="latex-prepend-backslash">
         <xsl:with-param name="string" select="$string_replace6"/>
-        <xsl:with-param name="character">{</xsl:with-param>
+        <xsl:with-param name="character">}</xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:value-of select="$string_replace7"/>