commit f26e1b355333cbb5b064da3b4bbf2dc450a5eb40
author Mathieu Chartier <mathieuc@google.com> Thu Jan 29 10:47:10 2015 -0800
committer Brian Carlstrom <bdc@google.com> Sat Jan 31 22:05:23 2015 -0800
tree 7860e465848418b128f39f0850972c9daa355a5a
parent f2eb160e685d544eda859e5df5e44b5b4c096760

Check for null class of class

Experimental fix.

Bug: 19193521

(cherry picked from commit 65370e37b3fd9e53e3c1bce5757912e8309cd305)

Change-Id: If59fe9a7bd16f3578ed036a5dbb2787862b33766

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index d89ad5e..a0e978b 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -4382,6 +4382,10 @@
       LOG(ERROR) << "Invalid class for managed heap object: " << o << " " << c;
       return HPSG_STATE(SOLIDITY_HARD, KIND_UNKNOWN);
     }
+    if (c->GetClass() == nullptr) {
+      LOG(ERROR) << "Null class of class " << c << " for object " << o;
+      return HPSG_STATE(SOLIDITY_HARD, KIND_UNKNOWN);
+    }
     if (c->IsClassClass()) {
       return HPSG_STATE(SOLIDITY_HARD, KIND_CLASS_OBJECT);
     }