diff options
Diffstat (limited to 'runtime/jni')
| -rw-r--r-- | runtime/jni/check_jni.cc | 10 | ||||
| -rw-r--r-- | runtime/jni/jni_internal.cc | 21 |
2 files changed, 26 insertions, 5 deletions
diff --git a/runtime/jni/check_jni.cc b/runtime/jni/check_jni.cc index a05a3e97f2..24e3256d81 100644 --- a/runtime/jni/check_jni.cc +++ b/runtime/jni/check_jni.cc @@ -747,10 +747,10 @@ class ScopedCheck { return true; } - bool CheckInstantiableNonArray(ScopedObjectAccess& soa, jclass jc) + bool CheckNonArray(ScopedObjectAccess& soa, jclass jc) REQUIRES_SHARED(Locks::mutator_lock_) { ObjPtr<mirror::Class> c = soa.Decode<mirror::Class>(jc); - if (!c->IsInstantiableNonArray()) { + if (c->IsArrayClass()) { AbortF("can't make objects of type %s: %p", c->PrettyDescriptor().c_str(), c.Ptr()); return false; } @@ -2195,7 +2195,7 @@ class CheckJNI { ScopedObjectAccess soa(env); ScopedCheck sc(kFlag_Default, __FUNCTION__); JniValueType args[2] = {{.E = env}, {.c = c}}; - if (sc.Check(soa, true, "Ec", args) && sc.CheckInstantiableNonArray(soa, c)) { + if (sc.Check(soa, true, "Ec", args) && sc.CheckNonArray(soa, c)) { JniValueType result; result.L = baseEnv(env)->AllocObject(env, c); if (sc.Check(soa, false, "L", &result)) { @@ -2211,7 +2211,7 @@ class CheckJNI { ScopedCheck sc(kFlag_Default, __FUNCTION__); VarArgs rest(mid, vargs); JniValueType args[4] = {{.E = env}, {.c = c}, {.m = mid}, {.va = &rest}}; - if (sc.Check(soa, true, "Ecm.", args) && sc.CheckInstantiableNonArray(soa, c) && + if (sc.Check(soa, true, "Ecm.", args) && sc.CheckNonArray(soa, c) && sc.CheckConstructor(mid)) { JniValueType result; result.L = baseEnv(env)->NewObjectV(env, c, mid, vargs); @@ -2237,7 +2237,7 @@ class CheckJNI { ScopedCheck sc(kFlag_Default, __FUNCTION__); VarArgs rest(mid, vargs); JniValueType args[4] = {{.E = env}, {.c = c}, {.m = mid}, {.va = &rest}}; - if (sc.Check(soa, true, "Ecm.", args) && sc.CheckInstantiableNonArray(soa, c) && + if (sc.Check(soa, true, "Ecm.", args) && sc.CheckNonArray(soa, c) && sc.CheckConstructor(mid)) { JniValueType result; result.L = baseEnv(env)->NewObjectA(env, c, mid, vargs); diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc index 1dde2de741..9129d9ed41 100644 --- a/runtime/jni/jni_internal.cc +++ b/runtime/jni/jni_internal.cc @@ -922,6 +922,13 @@ class JNI { if (c == nullptr) { return nullptr; } + if (UNLIKELY(!c->IsInstantiable())) { + soa.Self()->ThrowNewExceptionF( + "Ljava/lang/InstantiationException;", "Can't instantiate %s %s", + c->IsInterface() ? "interface" : "abstract class", + c->PrettyDescriptor().c_str()); + return nullptr; + } if (c->IsStringClass()) { gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); return soa.AddLocalReference<jobject>( @@ -949,6 +956,13 @@ class JNI { if (c == nullptr) { return nullptr; } + if (UNLIKELY(!c->IsInstantiable())) { + soa.Self()->ThrowNewExceptionF( + "Ljava/lang/InstantiationException;", "Can't instantiate %s %s", + c->IsInterface() ? "interface" : "abstract class", + c->PrettyDescriptor().c_str()); + return nullptr; + } if (c->IsStringClass()) { // Replace calls to String.<init> with equivalent StringFactory call. jmethodID sf_mid = jni::EncodeArtMethod<kEnableIndexIds>( @@ -975,6 +989,13 @@ class JNI { if (c == nullptr) { return nullptr; } + if (UNLIKELY(!c->IsInstantiable())) { + soa.Self()->ThrowNewExceptionF( + "Ljava/lang/InstantiationException;", "Can't instantiate %s %s", + c->IsInterface() ? "interface" : "abstract class", + c->PrettyDescriptor().c_str()); + return nullptr; + } if (c->IsStringClass()) { // Replace calls to String.<init> with equivalent StringFactory call. jmethodID sf_mid = jni::EncodeArtMethod<kEnableIndexIds>( |