Author: jim Date: Wed Mar 5 08:20:19 2008 New Revision: 633909 URL: http://svn.apache.org/viewvc?rev=633909&view=rev Log: Merge r627883 from trunk:
Fix ArrayIndexOutOfBoundsException reported on users list. Patch provided by Charles R Caldarale. Submitted by: markt Reviewed by: jim Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=633909&r1=633908&r2=633909&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 5 08:20:19 2008 @@ -47,12 +47,6 @@ +1: fhanik, markt, remm, jfclere -1: -* Fix ArrayIndexOutOfBoundsException when empty URL is requested - http://svn.apache.org/viewvc?rev=627883&view=rev - +1: markt, jim - +1: fhanik - although, I just don't see how this would ever happen, the smallest URI is "/" - -1: - * Add tests for the cookie parsing and use package org.apache.catalina.tomcat.util.http http://people.apache.org/~jfclere/patches/test_cookies.patch2 +1: jfclere, fhanik, markt Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=633909&r1=633908&r2=633909&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Mar 5 08:20:19 2008 @@ -682,6 +682,10 @@ int start = uriBC.getStart(); int end = uriBC.getEnd(); + // An empty URL is not acceptable + if (start == end) + return false; + // URL * is acceptable if ((end - start == 1) && b[start] == (byte) '*') return true; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]