commit 0630ab5239a7d7be24dedbc3f66c822332446fc3
author Sebastien Hertz <shertz@google.com> Thu Nov 28 18:53:35 2013 +0100
committer Sebastien Hertz <shertz@google.com> Thu Dec 12 09:29:04 2013 +0100
tree 3043efa35ae177db590340138b52772bf71642dd
parent 315ab6c077c4db2031f1ffa40b78722d8269dc9b

Fix null argument handling during invoke from JDWP.

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

Change-Id: I167f93f3a411f0de8458db3ba5bed3169d557ee9

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 52a2141..2b82167 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2712,7 +2712,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;
         }