8312126: NullPointerException in CertStore.getCRLs after 8297955

Backport-of: 3c743cfea00692d0b938cb1cbde936084eecf369
openjdk · Nov 10, 2023 · 0cdcc13 · 0cdcc13 · openjdk-notifier · Nov 10, 2023
1 parent b506559
commit 0cdcc13
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
@@ -779,9 +779,13 @@ synchronized Collection<X509CRL> getCRLs(X509CRLSelector xsel,
                 } catch (IllegalArgumentException e) {
                     continue;
                 }
-            } else {
+            } else if (nameObject instanceof String) {
                 issuerName = (String)nameObject;
+            } else {
+                throw new CertStoreException(
+                    "unrecognized issuerName: must be String or byte[]");
             }
+
             // If all we want is CA certs, try to get the (probably shorter) ARL
             Collection<X509CRL> entryCRLs = Collections.emptySet();
             if (certChecking == null || certChecking.getBasicConstraints() != -1) {