This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 74babb122c Avoid potential IndexOutOfBoundsException when matching HTTP/2 preface. Submitted #551 by 刘文章. 74babb122c is described below commit 74babb122c9d4ab6d212cda1cf458fd655a2c3a3 Author: lihan <li...@apache.org> AuthorDate: Wed Sep 7 14:40:51 2022 +0800 Avoid potential IndexOutOfBoundsException when matching HTTP/2 preface. Submitted #551 by 刘文章. --- java/org/apache/coyote/http11/Http11InputBuffer.java | 2 +- webapps/docs/changelog.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java b/java/org/apache/coyote/http11/Http11InputBuffer.java index 06ff079c34..6496d8c2b2 100644 --- a/java/org/apache/coyote/http11/Http11InputBuffer.java +++ b/java/org/apache/coyote/http11/Http11InputBuffer.java @@ -366,7 +366,7 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler // Switch to the socket timeout. wrapper.setReadTimeout(connectionTimeout); } - if (!keptAlive && byteBuffer.position() == 0 && byteBuffer.limit() >= CLIENT_PREFACE_START.length - 1) { + if (!keptAlive && byteBuffer.position() == 0 && byteBuffer.limit() >= CLIENT_PREFACE_START.length) { boolean prefaceMatch = true; for (int i = 0; i < CLIENT_PREFACE_START.length && prefaceMatch; i++) { if (CLIENT_PREFACE_START[i] != byteBuffer.get(i)) { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4860a2b309..09aab642b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -218,6 +218,11 @@ the maximum value to 255. Based on a PR <pr>548</pr> by Stefan Mayr. (lihan) </fix> + <fix> + <pr>551</pr>: Avoid potential IndexOutOfBoundsException by fixing + incorrect check when matching HTTP/2 preface. Submitted by 刘文章. + (lihan) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org