commit 4aebd580c9c9de348b8fefed6353b86621cceb53
author Nicolas Geoffray <ngeoffray@google.com> Fri Jul 23 15:27:31 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jul 23 16:09:23 2021 +0000
tree 47f07ff4173534c92ff9673d6d423c4df13bbe6e
parent d7a4da1f357e089c5d150559d8d2f2ddb7c4958a

Add some null checks in case of OOME.

Test: test.py
Bug: 194471075
Change-Id: Ib02845636af4d3944a96f001e5ad728a94832285

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 9d9b94a..5e6ae1a 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -9330,7 +9330,9 @@
 
   Handle<mirror::MethodType> type = hs.NewHandle(
       mirror::MethodType::Create(self, return_type, method_params));
-  dex_cache->SetResolvedMethodType(proto_idx, type.Get());
+  if (type != nullptr) {
+    dex_cache->SetResolvedMethodType(proto_idx, type.Get());
+  }
 
   return type.Get();
 }