diff options
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 7fd40c945c..25418a9758 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -1414,8 +1414,8 @@ jobjectArray Thread::InternalStackTraceToStackTraceElementArray(JNIEnv* env, job mirror::ArtMethod* method = down_cast<mirror::ArtMethod*>(method_trace->Get(i)); MethodHelper mh(method); int32_t line_number; - SirtRef<mirror::String> class_name_object(soa.Self(), NULL); - SirtRef<mirror::String> source_name_object(soa.Self(), NULL); + SirtRef<mirror::String> class_name_object(soa.Self(), nullptr); + SirtRef<mirror::String> source_name_object(soa.Self(), nullptr); if (method->IsProxyMethod()) { line_number = -1; class_name_object.reset(method->GetDeclaringClass()->GetName()); @@ -1427,16 +1427,18 @@ jobjectArray Thread::InternalStackTraceToStackTraceElementArray(JNIEnv* env, job // Allocate element, potentially triggering GC // TODO: reuse class_name_object via Class::name_? const char* descriptor = mh.GetDeclaringClassDescriptor(); - CHECK(descriptor != NULL); + CHECK(descriptor != nullptr); std::string class_name(PrettyDescriptor(descriptor)); class_name_object.reset(mirror::String::AllocFromModifiedUtf8(soa.Self(), class_name.c_str())); - if (class_name_object.get() == NULL) { - return NULL; + if (class_name_object.get() == nullptr) { + return nullptr; } const char* source_file = mh.GetDeclaringClassSourceFile(); - source_name_object.reset(mirror::String::AllocFromModifiedUtf8(soa.Self(), source_file)); - if (source_name_object.get() == NULL) { - return NULL; + if (source_file != nullptr) { + source_name_object.reset(mirror::String::AllocFromModifiedUtf8(soa.Self(), source_file)); + if (source_name_object.get() == nullptr) { + return nullptr; + } } } const char* method_name = mh.GetName(); |