diff options
| author | Andreas Gampe <agampe@google.com> | 2014-12-22 17:43:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-22 17:43:37 +0000 |
| commit | 508d2665febbb06c853bfab131c4dc7164fffabb (patch) | |
| tree | 31e5dbc57686d3bbf0d78b49ecbe454acfee7867 /runtime/jni_internal.cc | |
| parent | 094368ae2fa7a4eeaafb44f6018e498c1054af60 (diff) | |
| parent | a87630724ef4f8760684fa69c8ecc685735aff88 (diff) | |
| download | art-508d2665febbb06c853bfab131c4dc7164fffabb.zip art-508d2665febbb06c853bfab131c4dc7164fffabb.tar.gz art-508d2665febbb06c853bfab131c4dc7164fffabb.tar.bz2 | |
Merge "ART: Do not JNI abort on nullptr GetObjectRefType"
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 4797e69..37ad46e 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -2256,8 +2256,10 @@ class JNI { java_buffer, WellKnownClasses::java_nio_DirectByteBuffer_capacity)); } - static jobjectRefType GetObjectRefType(JNIEnv* env, jobject java_object) { - CHECK_NON_NULL_ARGUMENT_RETURN(java_object, JNIInvalidRefType); + static jobjectRefType GetObjectRefType(JNIEnv* env ATTRIBUTE_UNUSED, jobject java_object) { + if (java_object == nullptr) { + return JNIInvalidRefType; + } // Do we definitely know what kind of reference this is? IndirectRef ref = reinterpret_cast<IndirectRef>(java_object); @@ -2274,7 +2276,7 @@ class JNI { return JNILocalRefType; } LOG(FATAL) << "IndirectRefKind[" << kind << "]"; - return JNIInvalidRefType; + UNREACHABLE(); } private: |