diff options
| author | Sebastien Hertz <shertz@google.com> | 2013-11-27 15:49:42 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2013-12-05 15:02:35 +0100 |
| commit | 123756a041baf8421ed933312605daa5ef082f6f (patch) | |
| tree | 0b9524660399b9e42adcc178027c9ddd8a61bd38 /runtime/stack.cc | |
| parent | 315ab6c077c4db2031f1ffa40b78722d8269dc9b (diff) | |
| download | art-123756a041baf8421ed933312605daa5ef082f6f.zip art-123756a041baf8421ed933312605daa5ef082f6f.tar.gz art-123756a041baf8421ed933312605daa5ef082f6f.tar.bz2 | |
Fix JDWP class-only modifier.
Fix Dbg::MatchType which is used for class-only and exception-only modifiers.
Also fix crash happening when notifying an exception. A debugger may walk the
stack of the current thread so we need to keep the instrumentation stack frame
synced with the native stack.
Bug: 11856587
Change-Id: Ibf95f8a83ce9ee640abf945e498b42cc88ea92a0
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index a505383..4e3fb4a 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -259,6 +259,7 @@ std::string StackVisitor::DescribeLocation() const { } instrumentation::InstrumentationStackFrame& StackVisitor::GetInstrumentationStackFrame(uint32_t depth) const { + CHECK_LT(depth, thread_->GetInstrumentationStack()->size()); return thread_->GetInstrumentationStack()->at(depth); } |