commit b9eb15bc4bdf87194be945dd2cf35d655b8853f7
author Andreas Gampe <agampe@google.com> Thu Aug 21 23:10:47 2014 -0700
committer Andreas Gampe <agampe@google.com> Thu Aug 21 23:10:47 2014 -0700
tree 6a1580f87ef4ccf0a6e5a088124678b2a7b2642d
parent 39c2a379795460374b41e627257130e3c4ab961f

ART: Allow uninitialized runtime in oat code

Oatdump does not initialize a runtime. Avoid a segfault.

Bug: 17194559
Change-Id: I1a1bd3fc7762ff4714251617a975e832522fa879

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 9afad2b..6305994 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -531,7 +531,9 @@
     methods_pointer_index = num_set_bits;
   }
   const OatMethodOffsets& oat_method_offsets = methods_pointer_[methods_pointer_index];
-  if (oat_file_->IsExecutable() || Runtime::Current()->IsCompiler()) {
+  if (oat_file_->IsExecutable() ||
+      Runtime::Current() == nullptr ||        // This case applies for oatdump.
+      Runtime::Current()->IsCompiler()) {
     return OatMethod(
         oat_file_->Begin(),
         oat_method_offsets.code_offset_,