8328864: NullPointerException in sun.security.jca.ProviderList.getService()

Reviewed-by: weijun
This commit is contained in:
Ben Perez 2024-05-02 18:50:38 +00:00 committed by Weijun Wang
parent 73cdc9a070
commit cd3a607576
3 changed files with 47 additions and 3 deletions
src/java.base/share/classes/sun/security/jca
test/jdk/sun/security/jca

@ -369,17 +369,19 @@ public final class ProviderList {
int i;
// Preferred provider list
if (preferredPropList != null &&
(pList = preferredPropList.getAll(type, name)) != null) {
if (preferredPropList != null) {
pList = preferredPropList.getAll(type, name);
for (i = 0; i < pList.size(); i++) {
Provider p = getProvider(pList.get(i).provider);
if (p == null) {
continue;
}
Service s = p.getService(type, name);
if (s != null) {
return s;
}
}
}
for (i = 0; i < configs.length; i++) {
Provider p = getProvider(i);
Service s = p.getService(type, name);

@ -0,0 +1,41 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.security.*;
/**
* @test
* @bug 8328864
* @summary Test that ProviderList.getService checks configs when
* ProviderList.getProvider fails for preferred providers.
* @run main/othervm
* -Djava.security.properties=${test.src}/app-security.properties NullPreferredList
*/
public class NullPreferredList {
public static void main(final String[] args) throws Exception {
final KeyStore ks = KeyStore.getInstance("PKCS12");
System.out.println("Got keystore " + ks);
}
}

@ -0,0 +1 @@
jdk.security.provider.preferred=KeyStore.PKCS12:NonExistingProvider