stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8140314: Verify IIOMetadataFormat class on loading

Browse Source 
Reviewed-by: bpb
This commit is contained in:
Phil Race 2016-07-22 15:57:57 -07:00
parent 13f9c0a307
commit f3b4127564
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
View File

@ -414,14 +414,23 @@ public abstract class IIOMetadata {
}
}
// If updating this method also see the same in ImageReaderWriterSpi.java
private Class<?> getMetadataFormatClass(String formatClassName) {
Module thisModule = IIOMetadata.class.getModule();
Module targetModule = this.getClass().getModule();
Class<?> c = Class.forName(targetModule, formatClassName);
Class<?> c = null;
try {
ClassLoader cl = this.getClass().getClassLoader();
c = Class.forName(formatClassName, false, cl);
if (!IIOMetadataFormat.class.isAssignableFrom(c)) {
return null;
}
} catch (ClassNotFoundException e) {
}
if (thisModule.equals(targetModule) || c == null) {
return c;
}
if (thisModule.isNamed()) {
if (targetModule.isNamed()) {
int i = formatClassName.lastIndexOf(".");
String pn = i > 0 ? formatClassName.substring(0, i) : "";
if (!targetModule.isExported(pn, thisModule)) {

13
jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
View File

@ -604,14 +604,23 @@ public abstract class ImageReaderWriterSpi extends IIOServiceProvider {
}
}
// If updating this method also see the same in IIOMetadata.java
private Class<?> getMetadataFormatClass(String formatClassName) {
Module thisModule = ImageReaderWriterSpi.class.getModule();
Module targetModule = this.getClass().getModule();
Class<?> c = Class.forName(targetModule, formatClassName);
Class<?> c = null;
try {
ClassLoader cl = this.getClass().getClassLoader();
c = Class.forName(formatClassName, false, cl);
if (!IIOMetadataFormat.class.isAssignableFrom(c)) {
return null;
}
} catch (ClassNotFoundException e) {
}
if (thisModule.equals(targetModule) || c == null) {
return c;
}
if (thisModule.isNamed()) {
if (targetModule.isNamed()) {
int i = formatClassName.lastIndexOf(".");
String pn = i > 0 ? formatClassName.substring(0, i) : "";
if (!targetModule.isExported(pn, thisModule)) {

2
jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh
View File

@ -22,7 +22,7 @@
#
# @test
# @bug 8081729
# @bug 8081729 8140314
# @summary Test external plugin as classpath jar and as a modular jar.
# Test both cases with and without a security manager.