commit 6054239c1d10e35dfa953c9c3d414db366e86650
author Sebastien Hertz <shertz@google.com> Thu Dec 12 08:33:37 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 08:33:37 2013 +0000
tree 3f06f1636d4142ef9c518374d82999a527fb7781
parent 19031d51ab9edfc3b1996891d654a6b86ca937c0
parent 0630ab5239a7d7be24dedbc3f66c822332446fc3

Merge "Fix null argument handling during invoke from JDWP."

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index bb44db8..8e67228 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2713,7 +2713,7 @@
         if (argument == ObjectRegistry::kInvalidObject) {
           return JDWP::ERR_INVALID_OBJECT;
         }
-        if (!argument->InstanceOf(parameter_type)) {
+        if (argument != NULL && !argument->InstanceOf(parameter_type)) {
           return JDWP::ERR_ILLEGAL_ARGUMENT;
         }
 

runtime/jdwp/object_registry.cc

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 @@
 }
 
 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);