Only construct real Throwable objects. Without this test, someone could trick us into constructing other shady classes. Test: builds, boots Bug: 65281159 Change-Id: If678d0681708d1b0dcf056aa1133830ad3dbce31
diff --git a/core/java/android/os/ParcelableException.java b/core/java/android/os/ParcelableException.java index d84d629..7f71905 100644 --- a/core/java/android/os/ParcelableException.java +++ b/core/java/android/os/ParcelableException.java
@@ -52,10 +52,12 @@ final String msg = in.readString(); try { final Class<?> clazz = Class.forName(name, true, Parcelable.class.getClassLoader()); - return (Throwable) clazz.getConstructor(String.class).newInstance(msg); + if (Throwable.class.isAssignableFrom(clazz)) { + return (Throwable) clazz.getConstructor(String.class).newInstance(msg); + } } catch (ReflectiveOperationException e) { - throw new RuntimeException(name + ": " + msg); } + return new RuntimeException(name + ": " + msg); } /** {@hide} */