Fix missing null check in 'Adopt "JDK-8324646: Avoid Class.forName in…

… SecureRandom constructor"'
zakkak · Jun 13, 2024 · dcecff7 · dcecff7
1 parent 0edb942
commit dcecff7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
@@ -686,10 +686,13 @@ private static Function<String, Class<?>> getConstructorParameterClassAccessor(I
                 if (engineDescription == null) {
                     return null;
                 }
-                if (consParamClassFieldFinal.getName().equals("constructorParameterClassName")) {
-                    return loader.findClass((String) consParamClassFieldFinal.get(engineDescription)).get();
+                if (consParamClassFieldFinal.getName().equals("constructorParameterClass")) {
+                    return (Class<?>) consParamClassFieldFinal.get(engineDescription);
+                }
+                String constructorParameterClassName = (String) consParamClassFieldFinal.get(engineDescription);
+                if (constructorParameterClassName != null) {
+                    return loader.findClass(constructorParameterClassName).get();
                 }
-                return (Class<?>) consParamClassFieldFinal.get(engineDescription);
             } catch (IllegalAccessException e) {
                 VMError.shouldNotReachHere(e);
             }