This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 8d2fe68 Fix BZ 64830 - concurrency issue in HPACK decoder 8d2fe68 is described below commit 8d2fe6894d6e258a6d615d7f786acca80e6020cb Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Nov 9 19:23:12 2020 +0000 Fix BZ 64830 - concurrency issue in HPACK decoder https://bz.apache.org/bugzilla/show_bug.cgi?id=64830 --- java/org/apache/coyote/http2/HpackDecoder.java | 12 ++++-------- webapps/docs/changelog.xml | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/java/org/apache/coyote/http2/HpackDecoder.java b/java/org/apache/coyote/http2/HpackDecoder.java index 551101b..517dc0b 100644 --- a/java/org/apache/coyote/http2/HpackDecoder.java +++ b/java/org/apache/coyote/http2/HpackDecoder.java @@ -72,8 +72,6 @@ public class HpackDecoder { private volatile boolean countedCookie; private volatile int headerSize = 0; - private final StringBuilder stringBuilder = new StringBuilder(); - HpackDecoder(int maxMemorySize) { this.maxMemorySizeHard = maxMemorySize; this.maxMemorySizeSoft = maxMemorySize; @@ -222,19 +220,17 @@ public class HpackDecoder { if (huffman) { return readHuffmanString(length, buffer); } + StringBuilder stringBuilder = new StringBuilder(length); for (int i = 0; i < length; ++i) { stringBuilder.append((char) buffer.get()); } - String ret = stringBuilder.toString(); - stringBuilder.setLength(0); - return ret; + return stringBuilder.toString(); } private String readHuffmanString(int length, ByteBuffer buffer) throws HpackException { + StringBuilder stringBuilder = new StringBuilder(length); HPackHuffman.decode(buffer, length, stringBuilder); - String ret = stringBuilder.toString(); - stringBuilder.setLength(0); - return ret; + return stringBuilder.toString(); } private String handleIndexedHeaderName(int index) throws HpackException { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b3d0001..57af76f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -132,6 +132,9 @@ Add additional debug logging for I/O issues when communicating with the user agent. (markt) </add> + <fix> + <bug>64830</bug>: Fix concurrency issue in HPACK decoder. (markt) + </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