[tomcat] branch 8.5.x updated: Fix NPE

[re...@apache.org]

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 3e6b561  Fix NPE
3e6b561 is described below

commit 3e6b56133b95b6923460432cdccd26134bc67f0c
Author: remm <re...@apache.org>
AuthorDate: Thu Jan 28 13:14:14 2021 +0100

    Fix NPE
---
 java/org/apache/tomcat/jni/SSLContext.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index 8c2f9b9..1810571 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -419,7 +419,8 @@ public final class SSLContext {
         }
         // Can't be sure OpenSSL is going to provide the SNI value in lower case
         // so convert it before looking up the SSLContext
-        return sniCallBack.getSslContext(sniHostName.toLowerCase(Locale.ENGLISH));
+        String hostName = (sniHostName == null) ? null : sniHostName.toLowerCase(Locale.ENGLISH);
+        return sniCallBack.getSslContext(hostName);
     }
 
     /**


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