You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 1999/12/24 05:40:05 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler JspUtil.java

rubys       99/12/23 20:40:04

  Modified:    src/share/org/apache/jasper/compiler JspUtil.java
  Log:
  Fix for: Bogus request time attrs accepted.
  Danno Ferrin <sh...@earthlink.net> noted that the code in JspUtil
  did not properly ensure that opening and closing expression delimiters
  matched.  Also changed the XML delimiters to match the spec.
  
  Revision  Changes    Path
  1.6       +20 -20    jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java
  
  Index: JspUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JspUtil.java	1999/12/23 08:30:20	1.5
  +++ JspUtil.java	1999/12/24 04:40:04	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v 1.5 1999/12/23 08:30:20 mode Exp $
  - * $Revision: 1.5 $
  - * $Date: 1999/12/23 08:30:20 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v 1.6 1999/12/24 04:40:04 rubys Exp $
  + * $Revision: 1.6 $
  + * $Date: 1999/12/24 04:40:04 $
    *
    * ====================================================================
    * 
  @@ -88,8 +88,8 @@
   
       private static final String OPEN_EXPR  = "<%=";
       private static final String CLOSE_EXPR = "%>";
  -    private static final String OPEN_EXPR_2	 = "<jsp:expression";
  -    private static final String CLOSE_EXPR_2 = "/>";
  +    private static final String OPEN_EXPR_2 = "<jsp:expression>";
  +    private static final String CLOSE_EXPR_2 = "</jsp:expression>";
   
       public static char[] removeQuotes(char []chars) {
   	CharArrayWriter caw = new CharArrayWriter();
  @@ -108,29 +108,29 @@
       // Checks if the token is a runtime expression.
       public static boolean isExpression (String token) {
   	
  -	if ((token.startsWith(OPEN_EXPR) || token.startsWith(OPEN_EXPR_2)) &&
  -	    (token.endsWith(CLOSE_EXPR) || token.endsWith(CLOSE_EXPR_2)))
  +	if (token.startsWith(OPEN_EXPR) && token.endsWith(CLOSE_EXPR))
   	    return true;
  +
  +	if (token.startsWith(OPEN_EXPR_2) && token.endsWith(CLOSE_EXPR_2))
  +	    return true;
  +
   	return false;
       }
   
       // Returns the "expression" part -- takin <%= and %> out.
       public static String getExpr (String expression) {
  -	String returnString = "";
  +	String returnString;
  +	int length = expression.length();
   	
  -	if (expression.startsWith(OPEN_EXPR))
  -	    returnString = expression.substring (OPEN_EXPR.length());
  -	else if (expression.startsWith(OPEN_EXPR_2))
  -	    returnString = expression.substring (OPEN_EXPR_2.length()); 
  -	
  -	int length = returnString.length();
  -	if (expression.endsWith(CLOSE_EXPR))
  -	    returnString = returnString.substring (0, length - 
  -	    						CLOSE_EXPR.length());
  -	else if (expression.endsWith(CLOSE_EXPR_2))
  -	    returnString = returnString.substring (0, length - 
  -	    						CLOSE_EXPR_2.length());
  +	if (expression.startsWith(OPEN_EXPR) && expression.endsWith(CLOSE_EXPR))
  +	    returnString = expression.substring (OPEN_EXPR.length(), length - CLOSE_EXPR.length());
  +
  +	else if (expression.startsWith(OPEN_EXPR_2) && expression.endsWith(CLOSE_EXPR_2))
  +	    returnString = expression.substring (OPEN_EXPR_2.length(), length - CLOSE_EXPR_2.length());
   	
  +	else
  +	    returnString = "";
  +
   	return returnString;
       }