[tomcat] branch 8.5.x updated: Avoid possible NPE

[remm]

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

remm 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 6605420694 Avoid possible NPE
6605420694 is described below

commit 6605420694ef1490993389410615f2b8a6683497
Author: remm <r...@apache.org>
AuthorDate: Thu Sep 14 16:52:01 2023 +0200

    Avoid possible NPE
    
    Found by coverity.
---
 java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java 
b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
index e642721096..de3660e6f2 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
@@ -43,7 +43,9 @@ public class UpgradeProcessorExternal extends 
UpgradeProcessorBase {
             UpgradeGroupInfo upgradeGroupInfo) {
         super(upgradeToken);
         this.upgradeInfo = new UpgradeInfo();
-        upgradeGroupInfo.addUpgradeInfo(upgradeInfo);
+        if (upgradeGroupInfo != null) {
+            upgradeGroupInfo.addUpgradeInfo(upgradeInfo);
+        }
         this.upgradeServletInputStream = new UpgradeServletInputStream(this, 
wrapper, upgradeInfo);
         this.upgradeServletOutputStream = new UpgradeServletOutputStream(this, 
wrapper, upgradeInfo);
 


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