Author: remm
Date: Tue May 22 13:36:33 2018
New Revision: 1832026
URL: http://svn.apache.org/viewvc?rev=1832026&view=rev
Log:
Add exception message and validate offset as well.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java?rev=1832026&r1=1832025&r2=1832026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java Tue May 22
13:36:33 2018
@@ -104,9 +104,9 @@ class Http2AsyncParser extends Http2Pars
@Override
public CompletionHandlerCall callHandler(CompletionState state,
ByteBuffer[] buffers, int offset, int length) {
- if (length != 2) {
+ if (offset != 0 || length != 2) {
try {
- throw new IllegalArgumentException();
+ throw new
IllegalArgumentException(sm.getString("http2Parser.invalidBuffers"));
} catch (IllegalArgumentException e) {
error = e;
return CompletionHandlerCall.DONE;
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1832026&r1=1832025&r2=1832026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue May
22 13:36:33 2018
@@ -71,6 +71,7 @@ http2Parser.processFrameWindowUpdate.deb
http2Parser.processFrameWindowUpdate.invalidIncrement=Window update frame
received with an invalid increment size of [0]
http2Parser.processFrameWindowUpdate.invalidPayloadSize=Window update frame
received with an invalid payload size of [{0}]
http2Parser.swallow.debug=Connection [{0}], Stream [{1}], Swallowed [{2}] bytes
+http2Parser.invalidBuffers=Reading should be done with two buffers
pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
