From 00098cb8a201b11371dd75de0d62a24d6d8f0707 Mon Sep 17 00:00:00 2001
From: smarks <unknown>
Date: Mon, 10 Sep 2012 16:05:53 -0700
Subject: [PATCH] 7195919: (sl) ServiceLoader can throw CCE without needing to
 create instance Reviewed-by: ahgross, alanb, dmeetry

---
 src/share/classes/java/util/ServiceLoader.java | 15 +++++++++++----
 src/share/classes/sun/misc/Service.java        | 12 ++++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/share/classes/java/util/ServiceLoader.java b/src/share/classes/java/util/ServiceLoader.java
index 62aa9dd24..37176c677 100644
--- a/src/share/classes/java/util/ServiceLoader.java
+++ b/src/share/classes/java/util/ServiceLoader.java
@@ -358,14 +358,21 @@ public final class ServiceLoader<S>
             }
             String cn = nextName;
             nextName = null;
+            Class<?> c = null;
             try {
-                S p = service.cast(Class.forName(cn, true, loader)
-                                   .newInstance());
-                providers.put(cn, p);
-                return p;
+                c = Class.forName(cn, false, loader);
             } catch (ClassNotFoundException x) {
                 fail(service,
                      "Provider " + cn + " not found");
+            }
+            if (!service.isAssignableFrom(c)) {
+                fail(service,
+                     "Provider " + cn  + " not a subtype");
+            }
+            try {
+                S p = service.cast(c.newInstance());
+                providers.put(cn, p);
+                return p;
             } catch (Throwable x) {
                 fail(service,
                      "Provider " + cn + " could not be instantiated: " + x,
diff --git a/src/share/classes/sun/misc/Service.java b/src/share/classes/sun/misc/Service.java
index 37d39b430..d74abbd1c 100644
--- a/src/share/classes/sun/misc/Service.java
+++ b/src/share/classes/sun/misc/Service.java
@@ -284,12 +284,20 @@ public final class Service<S> {
             }
             String cn = nextName;
             nextName = null;
+            Class<?> c = null;
             try {
-                return service.cast(Class.forName(cn, true, loader).newInstance());
+                c = Class.forName(cn, false, loader);
             } catch (ClassNotFoundException x) {
                 fail(service,
                      "Provider " + cn + " not found");
-            } catch (Exception x) {
+            }
+            if (!service.isAssignableFrom(c)) {
+                fail(service,
+                     "Provider " + cn  + " not a subtype");
+            }
+            try {
+                return service.cast(c.newInstance());
+            } catch (Throwable x) {
                 fail(service,
                      "Provider " + cn + " could not be instantiated: " + x,
                      x);
-- 
GitLab