commit e3485840d071c98e946c4be6864bcd1932630653
author Sebastien Hertz <shertz@google.com> Mon Aug 31 14:37:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 31 14:37:58 2015 +0000
tree 94fcd57be24b2a011ef2f7dede01116b48246cbb
parent 40abca79b09107f33d9a44d5ce3620b5ef45fe44
parent 2e1c16d9a4695e4b5cab3ed3ec95f7a88e69c79f

Merge "JDWP: check object is assignable in ArrayReference.SetValues"

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 67099d7..8d34f5a 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -1191,6 +1191,10 @@
       if (error != JDWP::ERR_NONE) {
         return error;
       }
+      // Check if the object's type is compatible with the array's type.
+      if (o != nullptr && !o->InstanceOf(oa->GetClass()->GetComponentType())) {
+        return JDWP::ERR_TYPE_MISMATCH;
+      }
       oa->Set<false>(offset + i, o);
     }
   }