This is an automated email from the ASF dual-hosted git repository.

dashorst pushed a commit to branch archive/wicket-1.1.x
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 437035a3aa73c1186866c5003223d92be09823b3
Author: Juegen Donnerstag <[email protected]>
AuthorDate: Sat Feb 18 19:56:30 2006 +0000

    backported a fix which causes stack overflows if comments are to be removed 
from the markup
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/incubator/wicket/branches/WICKET_1_1@459440 
13f79535-47bb-0310-9956-ffa450edef68
---
 wicket/src/java/wicket/markup/MarkupParser.java | 29 ++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/wicket/src/java/wicket/markup/MarkupParser.java 
b/wicket/src/java/wicket/markup/MarkupParser.java
index db55dbe69b..e0baba23e9 100644
--- a/wicket/src/java/wicket/markup/MarkupParser.java
+++ b/wicket/src/java/wicket/markup/MarkupParser.java
@@ -308,7 +308,7 @@ public class MarkupParser
        
                            if (stripComments)
                            {
-                               rawMarkup = 
rawMarkup.replaceAll("<!--(.|\n|\r)*?-->", "");
+                               rawMarkup = removeComment(rawMarkup);
                            }
        
                            if (compressWhitespace)
@@ -391,6 +391,33 @@ public class MarkupParser
         return Collections.unmodifiableList(list);
     }
 
+    /**
+     * Remove all comment sections (&lt;!-- .. --&gt;) from the raw markup.
+     * For reasons I don't understand, the following regex 
<code>"<!--(.|\n|\r)*?-->"<code>
+     * causes a stack overflow in some circumstances (jdk 1.5) 
+     * 
+     * @param rawMarkup
+     * @return raw markup
+     */
+    private String removeComment(String rawMarkup)
+    {
+       int pos1 = rawMarkup.indexOf("<!--");
+       while (pos1 >= 0)
+       {
+               StringBuffer buf = new StringBuffer(rawMarkup.length());
+               int pos2 = rawMarkup.indexOf("-->", pos1);
+               
+               if (pos2 >= 0)
+               {
+                       buf.append(rawMarkup.substring(0, pos1 - 1));
+                       buf.append(rawMarkup.substring(pos2 + 4));
+                       rawMarkup = buf.toString();
+               }
+               pos1 = rawMarkup.indexOf("<!--");
+       }
+       return rawMarkup;
+    }
+    
     /**
      * Determine wicket namespace from xmlns:wicket or
      * xmlns:wicket="http://wicket.sourceforge.net";

Reply via email to