Merge pull request #242 from rlm2002/sniServerNames

getSNIRequest checks for null value before converting to String
wolfSSL · Dec 16, 2024 · 9db7ff1 · 9db7ff1
2 parents 8ae65d4 + 5c6d7eb
commit 9db7ff1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/java/com/wolfssl/WolfSSLSession.java b/src/java/com/wolfssl/WolfSSLSession.java
@@ -4147,10 +4147,15 @@ public byte[] getSNIRequestBytes(byte type) throws IllegalStateException {
      *         active
      */
     public String getSNIRequest(byte type) throws IllegalStateException {
+        byte[] request;
 
         confirmObjectIsActive();
+        request = getSNIRequestBytes(type);
+        if (request != null){
+            return new String(request, StandardCharsets.UTF_8);
+        }
 
-        return new String(getSNIRequestBytes(type), StandardCharsets.UTF_8);
+        return null;
     }
 
     /**