[Xss-html-filter-commits] SF.net SVN: xss-html-filter:[30] trunk/src/main/java/net/sf/xsshtmlfilter/ HTMLFilter.java

[<mic...@us...>]

Revision: 30
          http://xss-html-filter.svn.sourceforge.net/xss-html-filter/?rev=30&view=rev
Author:   micksembwever
Date:     2011-06-03 12:46:53 +0000 (Fri, 03 Jun 2011)

Log Message:
-----------
use Matcher.quoteReplacement(..) for all m.appendReplacement(..) calls. xss-html-filter isn't intended to capture and replace groups, just filter.

Modified Paths:
--------------
    trunk/src/main/java/net/sf/xsshtmlfilter/HTMLFilter.java

Modified: trunk/src/main/java/net/sf/xsshtmlfilter/HTMLFilter.java
===================================================================
--- trunk/src/main/java/net/sf/xsshtmlfilter/HTMLFilter.java	2011-02-25 11:18:43 UTC (rev 29)
+++ trunk/src/main/java/net/sf/xsshtmlfilter/HTMLFilter.java	2011-06-03 12:46:53 UTC (rev 30)
@@ -42,6 +42,7 @@
  *
  * @author Joseph O'Connell
  * @author Cal Hendersen
+ * @author Michael Semb Wever
  */
 public final class HTMLFilter {
 
@@ -250,7 +251,7 @@
         final StringBuffer buf = new StringBuffer();
         if (m.find()) {
             final String match = m.group(1); //(.*?)
-            m.appendReplacement(buf, "<!--" + htmlSpecialChars(match) + "-->");
+            m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
         }
         m.appendTail(buf);
 
@@ -291,7 +292,7 @@
         while (m.find()) {
             String replaceStr = m.group(1);
             replaceStr = processTag(replaceStr);
-            m.appendReplacement(buf, replaceStr);
+            m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
         }
         m.appendTail(buf);
 
@@ -478,8 +479,7 @@
         while (m.find()) {
             final String one = m.group(1); //([^&;]*)
             final String two = m.group(2); //(?=(;|&|$))
-            final String replacement = Matcher.quoteReplacement(checkEntity(one, two));
-            m.appendReplacement(buf, replacement);
+            m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
         }
         m.appendTail(buf);
         s = buf.toString();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.