commit c114b5fbc91e6d19ef430d9bc3468386ca61b324
author Ian Rogers <irogers@google.com> Mon Jul 21 08:55:01 2014 -0700
committer Ian Rogers <irogers@google.com> Mon Jul 21 08:55:01 2014 -0700
tree 209973deaf02fdcccabc6e2c52a6db5df512aed9
parent a6d4bc19b0f68286862ce315377aaeb1e26a726b

Fix erroneous behaviors with OOME present.

Bug: 16454510
Change-Id: I757088a7b82ff73f58aba8d357080028b56442e6

runtime/native/java_lang_Class.cc

diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index e577c2c..124bdf5 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -71,7 +71,10 @@
     jthrowable cnfe = reinterpret_cast<jthrowable>(env->NewObject(WellKnownClasses::java_lang_ClassNotFoundException,
                                                                   WellKnownClasses::java_lang_ClassNotFoundException_init,
                                                                   javaName, cause.get()));
-    env->Throw(cnfe);
+    if (cnfe != nullptr) {
+      // Make sure allocation didn't fail with an OOME.
+      env->Throw(cnfe);
+    }
     return nullptr;
   }
   if (initialize) {