Author: markt
Date: Sat Oct 13 14:31:58 2012
New Revision: 1397840
URL: http://svn.apache.org/viewvc?rev=1397840&view=rev
Log:
Fix my errors. Reviewed by kkolinko
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1397839
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java?rev=1397840&r1=1397839&r2=1397840&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java Sat Oct 13
14:31:58 2012
@@ -842,12 +842,12 @@ class NoBodyOutputStream extends Servlet
lStrings.getString("err.io.nullArray"));
}
- if (offset < 0 || len < 0 || offset+len < buf.length) {
+ if (offset < 0 || len < 0 || offset+len > buf.length) {
String msg = lStrings.getString("err.io.indexOutOfBounds");
Object[] msgArgs = new Object[3];
msgArgs[0] = Integer.valueOf(offset);
msgArgs[1] = Integer.valueOf(len);
- msgArgs[2] = Integer.valueOf(offset + len);
+ msgArgs[2] = Integer.valueOf(buf.length);
msg = MessageFormat.format(msg, msgArgs);
throw new IndexOutOfBoundsException(msg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
