commit a35510de5aa1ec5d39c6870da556e2d60666cdc3
author Vladimir Marko <vmarko@google.com> Mon Jan 16 22:42:09 2017 +0000
committer Vladimir Marko <vmarko@google.com> Mon Jan 16 23:03:24 2017 +0000
tree 65e2c9f63cbe409b2fe7a48194a69ac4ecca6dde
parent 0d478f289f0e33f19693d135f1d562b57427ed32

Fix missing OOME check in reflection.

Test: 080-oom-throw
Change-Id: I5f18ea756e815978bf8682555470505959a8fad5

runtime/native/java_lang_Class.cc

diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 3341f53..5438a6d 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -428,6 +428,10 @@
   }
   auto ret = hs.NewHandle(mirror::ObjectArray<mirror::Method>::Alloc(
       soa.Self(), mirror::Method::ArrayClass(), num_methods));
+  if (ret.Get() == nullptr) {
+    soa.Self()->AssertPendingOOMException();
+    return nullptr;
+  }
   num_methods = 0;
   for (auto& m : klass->GetDeclaredMethods(kRuntimePointerSize)) {
     auto modifiers = m.GetAccessFlags();