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

[horwat]

horwat      01/07/17 15:12:03

  Modified:    jasper/src/share/org/apache/jasper/compiler JspUtil.java
                        ExpressionGenerator.java
  Log:
  Fix escape character quoting. As outlined in JSP 1.2 PFD section 2.6
  
  Bugzilla #2602
  
  Revision  Changes    Path
  1.9       +13 -3     
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
  
  Index: JspUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspUtil.java      2001/02/16 22:17:02     1.8
  +++ JspUtil.java      2001/07/17 22:12:03     1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
 1.8 2001/02/16 22:17:02 craigmcc Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/02/16 22:17:02 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
 1.9 2001/07/17 22:12:03 horwat Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/07/17 22:12:03 $
    *
    * ====================================================================
    * 
  @@ -118,6 +118,16 @@
            else caw.write(chars[i]);
        }
        return caw.toCharArray();
  +    }
  +
  +    public static char[] escapeQuotes (char []chars) {
  +        CharArrayWriter caw = new CharArrayWriter();
  +        for (int i = 0; i < chars.length; i++) {
  +            // escape out the escape character
  +            if (chars[i] == '\\') caw.write('\\');
  +            caw.write(chars[i]);
  +        }
  +        return caw.toCharArray();
       }
   
       /**
  
  
  
  1.2       +4 -4      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java
  
  Index: ExpressionGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExpressionGenerator.java  2000/08/12 00:52:07     1.1
  +++ ExpressionGenerator.java  2001/07/17 22:12:03     1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
 1.1 2000/08/12 00:52:07 pierred Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/08/12 00:52:07 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
 1.2 2001/07/17 22:12:03 horwat Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/07/17 22:12:03 $
    *
    * ====================================================================
    * 
  @@ -77,7 +77,7 @@
       }
       
       public void generate(ServletWriter writer, Class phase) {
  -     writer.println("out.print("+new String(JspUtil.removeQuotes(chars))+");");
  +     writer.println("out.print("+new String(JspUtil.escapeQuotes(chars))+");");
       }
   }