diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-02-01 06:19:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-01 06:19:39 +0000 |
| commit | e5deafe9cdd81238c3916b04301ea884c93f46b5 (patch) | |
| tree | 7860e465848418b128f39f0850972c9daa355a5a | |
| parent | f2eb160e685d544eda859e5df5e44b5b4c096760 (diff) | |
| parent | f26e1b355333cbb5b064da3b4bbf2dc450a5eb40 (diff) | |
| download | android_art-e5deafe9cdd81238c3916b04301ea884c93f46b5.tar.gz android_art-e5deafe9cdd81238c3916b04301ea884c93f46b5.tar.bz2 android_art-e5deafe9cdd81238c3916b04301ea884c93f46b5.zip | |
Merge "Check for null class of class"
| -rw-r--r-- | runtime/debugger.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index d89ad5e75c..a0e978b7e0 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -4382,6 +4382,10 @@ class HeapChunkContext { 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); } |