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

… SecureRandom constructor"'
graalvm · Jun 12, 2024 · fb4cd51 · fb4cd51
1 parent 0ca9d87
commit fb4cd51
Showing 1 changed file with 6 additions and 1 deletion.
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
@@ -687,7 +687,12 @@ private static Function<String, Class<?>> getConstructorParameterClassAccessor(I
                     return null;
                 }
                 if (consParamClassFieldFinal.getName().equals("constructorParameterClassName")) {
-                    return loader.findClass((String) consParamClassFieldFinal.get(engineDescription)).get();
+                    String constructorParameterClassName = (String) consParamClassFieldFinal.get(engineDescription);
+                    if (constructorParameterClassName != null) {
+                        return loader.findClass(constructorParameterClassName).get();
+                    } else {
+                        return null;
+                    }
                 }
                 return (Class<?>) consParamClassFieldFinal.get(engineDescription);
             } catch (IllegalAccessException e) {