Author: markt Date: Wed Jul 30 09:51:20 2008 New Revision: 681119 URL: http://svn.apache.org/viewvc?rev=681119&view=rev Log: Fix ArrayIndexOutOfBoundsException reported on users list. Patch provided by Charles R Caldarale.
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=681119&r1=681118&r2=681119&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java Wed Jul 30 09:51:20 2008 @@ -545,6 +545,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; Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681119&r1=681118&r2=681119&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 09:51:20 2008 @@ -45,6 +45,10 @@ <fix> Add additional checks for URI normalization. (remm) </fix> + <fix> + Don't throw an ArrayIndexOutOfBoundsException when empty URL is + requested. Patch provided by Charles R Caldarale. (markt) + </fix> </changelog> </subsection> <subsection name="Webapps"> Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681119&r1=681118&r2=681119&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 09:51:20 2008 @@ -35,11 +35,6 @@ the getClassloader() call. This call is only ever made if trace is enabled -* Fix ArrayIndexOutOfBoundsException when empty URL is requested - http://svn.apache.org/viewvc?rev=627883&view=rev - +1: markt, fhanik, yoavs - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562 http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up) http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]