Author: kkolinko Date: Wed Feb 24 10:12:58 2010 New Revision: 915737 URL: http://svn.apache.org/viewvc?rev=915737&view=rev Log: fixes for #getElement(): - avoid infinite looping on unexpected end of file - fix XML comment reading
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java Modified: tomcat/trunk/java/org/apache/jasper/JspC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=915737&r1=915736&r2=915737&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/JspC.java (original) +++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed Feb 24 10:12:58 2010 @@ -19,6 +19,7 @@ import java.io.BufferedReader; import java.io.CharArrayWriter; +import java.io.EOFException; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -947,15 +948,18 @@ while (!done) { int current = reader.read(); while (current != '>') { + if (current < 0) { + throw new EOFException(); + } result.append((char) current); current = reader.read(); } result.append((char) current); int len = result.length(); - if (len > 7 && result.substring(0, 4).equals("<!--")) { + if (len > 4 && result.substring(0, 4).equals("<!--")) { // This is a comment - make sure we are at the end - if (result.substring(len - 3, len).equals("-->")) { + if (len >= 7 && result.substring(len - 3, len).equals("-->")) { done = true; } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org