This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 0d71dd5 Fix possible NPE with excessive header size 0d71dd5 is described below commit 0d71dd5884632a89939fce3927dd09664ca9111b Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Oct 17 20:17:27 2019 +0100 Fix possible NPE with excessive header size --- java/org/apache/coyote/http11/Http11Processor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index c5df631..7249493 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -1404,7 +1404,10 @@ public class Http11Processor extends AbstractProcessor { Enumeration<String> values = headers.values(Constants.CONNECTION); Set<String> result = new HashSet<>(); while (values.hasMoreElements()) { - TokenList.parseTokenList(new StringReader(values.nextElement()), result); + String nextHeaderValue = values.nextElement(); + if (nextHeaderValue != null) { + TokenList.parseTokenList(new StringReader(nextHeaderValue), result); + } } return result.contains(token); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org