[tomcat] 04/06: Avoid possible NPE when stream is closed

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e1c4e17e1e8aac422ec27d71cf57b1a2f5f58404
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 21 16:34:10 2020 +0100

    Avoid possible NPE when stream is closed
---
 java/org/apache/coyote/http2/Stream.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 70b5e47..30fa819 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -651,9 +651,14 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
     final boolean isContentLengthInconsistent() {
-        long contentLengthHeader = coyoteRequest.getContentLengthLong();
-        if (contentLengthHeader > -1 && contentLengthReceived != 
contentLengthHeader) {
-            return true;
+        Request coyoteRequest = this.coyoteRequest;
+        // May be null when processing trailer headers after stream has been
+        // closed.
+        if (coyoteRequest != null) {
+            long contentLengthHeader = coyoteRequest.getContentLengthLong();
+            if (contentLengthHeader > -1 && contentLengthReceived != 
contentLengthHeader) {
+                return true;
+            }
         }
         return false;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org