From 0630ab5239a7d7be24dedbc3f66c822332446fc3 Mon Sep 17 00:00:00 2001
From: Sebastien Hertz <shertz@google.com>
Date: Thu, 28 Nov 2013 18:53:35 +0100
Subject: Fix null argument handling during invoke from JDWP.

Fix a crash when passing null argument to a JDWP invoke.

Change-Id: I167f93f3a411f0de8458db3ba5bed3169d557ee9
---
 runtime/jdwp/object_registry.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime/jdwp')

diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc
index be2219c..7408e92 100644
--- a/runtime/jdwp/object_registry.cc
+++ b/runtime/jdwp/object_registry.cc
@@ -118,6 +118,9 @@ mirror::Object* ObjectRegistry::InternalGet(JDWP::ObjectId id) {
 }
 
 jobject ObjectRegistry::GetJObject(JDWP::ObjectId id) {
+  if (id == 0) {
+    return NULL;
+  }
   Thread* self = Thread::Current();
   MutexLock mu(self, lock_);
   id_iterator it = id_to_entry_.find(id);
-- 
cgit v1.1