From cfac7388c58f4d9bd601b31508aae49e54af5a8f Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Wed, 15 Jan 2014 11:03:21 +0100
Subject: [PATCH] Escapes error messages

---
 .../org/apache/struts2/dispatcher/error.ftl          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
index 1b89aad79..090bb92a1 100644
--- a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
+++ b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
@@ -65,17 +65,17 @@
             <ol>
                 <#list msgs as msg>
                     <#if (msg?is_method)>
-                        <li>${msg[0]}</li>
+                        <li>${msg[0]?html}</li>
                     <#else>
-                        <li>${msg}</li>
+                        <li>${msg?html}</li>
                     </#if>
                 </#list>
             </ol>
             <#elseif (msgs?size == 1)>
                 <#if (msgs[0]?is_method)>
-                    <li>${msgs[0][0]}</li>
+                    <li>${msgs[0][0]?html}</li>
                 <#else>
-                    <li>${msgs[0]}</li>
+                    <li>${msgs[0]?html}</li>
                 </#if>
             </#if>
         </td>
@@ -126,11 +126,11 @@
 <h3>Stacktraces</h3>
 <#list chain as ex>
 <div class="stacktrace" style="padding-left: ${ex_index * 2}em">
-    <strong>${ex}</strong>
+    <strong>${ex?html}</strong>
     <div>
     <pre>
     <#list ex.stackTrace as frame>
-    ${frame}
+    ${frame?html}
     </#list>
     </pre>
     </div>