[freenet-cvs] r10596 - trunk/freenet/src/freenet/clients/http/filter

[t...@freenetproject.org]

Author: toad
Date: 2006-10-03 11:05:17 +0000 (Tue, 03 Oct 2006)
New Revision: 10596

Modified:
   trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
   trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
Log:
Fix another stupid filter bug.

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java       
2006-10-03 10:41:48 UTC (rev 10595)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java       
2006-10-03 11:05:17 UTC (rev 10596)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 02/10/06 21:14 */
+/* The following code was generated by JFlex 1.4.1 on 03/10/06 12:01 */

 /* This code is part of Freenet. It is distributed under the GNU General
  * Public License, version 2 (or at your option any later version). See
@@ -14,7 +14,7 @@
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/";>JFlex</a> 1.4.1
- * on 02/10/06 21:14 from the specification file
+ * on 03/10/06 12:01 from the specification file
  * <tt>freenet/clients/http/filter/CSSTokenizerFilter.jflex</tt>
  */
 class CSSTokenizerFilter {
@@ -962,6 +962,8 @@
                                } else {
                                        if(quote != ' ' && c == quote) {
                                                break;
+                                       } else if (quote == ' ' && c == ')') {
+                                               break;
                                        } else if (c == '\\') {
                                                justEscaping = true;
                                        } else {
@@ -971,7 +973,7 @@
                        }
                        x++;
                        data = buffer.toString();
-                       if(url && s.length() > x+1 && s.charAt(x) == ')')
+                       if(url && s.length() > x && s.charAt(x) == ')')
                                x++;
                        if(x < (s.length()-1))
                                suffix = s.substring(x);

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex      
2006-10-03 10:41:48 UTC (rev 10595)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex      
2006-10-03 11:05:17 UTC (rev 10596)
@@ -151,6 +151,8 @@
                                } else {
                                        if(quote != ' ' && c == quote) {
                                                break;
+                                       } else if (quote == ' ' && c == ')') {
+                                               break;
                                        } else if (c == '\\') {
                                                justEscaping = true;
                                        } else {
@@ -160,7 +162,7 @@
                        }
                        x++;
                        data = buffer.toString();
-                       if(url && s.length() > x+1 && s.charAt(x) == ')')
+                       if(url && s.length() > x && s.charAt(x) == ')')
                                x++;
                        if(x < (s.length()-1))
                                suffix = s.substring(x);