Merge "Fix crash in VirtualMachine.AllThreads JDWP command"

1 files changed, 5 insertions, 0 deletions

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index fa1a1a8b28..1cddb8bc9c 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2095,6 +2095,11 @@ void Dbg::GetThreads(JDWP::ObjectId thread_group_id, std::vector<JDWP::ObjectId>
         // query all threads, so it's easier if we just don't tell them about this thread.
         return;
       }
+      if (t->IsStillStarting()) {
+        // This thread is being started (and has been registered in the thread list). However, it is
+        // not completely started yet so we must ignore it.
+        return;
+      }
       mirror::Object* peer = t->GetPeer();
       if (IsInDesiredThreadGroup(peer)) {
         thread_ids_.push_back(gRegistry->Add(peer));