commit 413a8add7bdbf594122c1a2b3751eb798ce71cd7
author Alex Light <allight@google.com> Thu Feb 14 10:19:44 2019 -0800
committer Alex Light <allight@google.com> Thu Feb 14 10:20:36 2019 -0800
tree a6b85afab0927ae7e5fa947048e70c828169fd25
parent 794350fd0e21aa9e259b6c45394494871e7fdb13

Check jclasses are actually classes in ti_redefine.

There were a few places where we decoded jclasses and cast them to
mirror::Class without actually checking that they are classes first.
This makes us correctly return an INVALID_CLASS error if a non-class
jobject is given.

Test: ./test.py --host -j80

Change-Id: I4cee80726409019ff174333b59a5e4395c069ff6

openjdkjvmti/ti_redefine.cc

diff --git a/openjdkjvmti/ti_redefine.cc b/openjdkjvmti/ti_redefine.cc
index eb4bada..e51ae4d 100644
--- a/openjdkjvmti/ti_redefine.cc
+++ b/openjdkjvmti/ti_redefine.cc
@@ -240,7 +240,7 @@
   art::ScopedObjectAccess soa(self);
   art::StackHandleScope<1> hs(self);
   art::ObjPtr<art::mirror::Object> obj(self->DecodeJObject(klass));
-  if (obj.IsNull()) {
+  if (obj.IsNull() || !obj->IsClass()) {
     return ERR(INVALID_CLASS);
   }
   art::Handle<art::mirror::Class> h_klass(hs.NewHandle(obj->AsClass()));
@@ -256,7 +256,7 @@
   art::ScopedObjectAccess soa(self);
   art::StackHandleScope<1> hs(self);
   art::ObjPtr<art::mirror::Object> obj(self->DecodeJObject(klass));
-  if (obj.IsNull()) {
+  if (obj.IsNull() || !obj->IsClass()) {
     return ERR(INVALID_CLASS);
   }
   art::Handle<art::mirror::Class> h_klass(hs.NewHandle(obj->AsClass()));