commit e07fd17f3c45034470eb6f5a265152a39854995c
author Mathieu Chartier <mathieuc@google.com> Mon Nov 10 16:58:19 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Nov 11 09:42:17 2014 -0800
tree 5271ec9726d821aa23a6573ed5bd50083ebd11f4
parent 4c9c251c2a32cd8d1be21bc47a9188358cb9f17f

Add null check for thread name creation

Previously we didn't check for null which could result in check jni
failures if we tried to throw another OOM in the next allocation.

Bug: 18297817

(cherry picked from commit a7ade888ab99b1453571d14c41d4a0322c400fcd)

Change-Id: Ideef46f4900e546e81fbd9a5225c06698f36e9ac

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 2c44f27..2c828f1 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -431,6 +431,11 @@
     thread_group = runtime->GetMainThreadGroup();
   }
   ScopedLocalRef<jobject> thread_name(env, env->NewStringUTF(name));
+  // Add missing null check in case of OOM b/18297817
+  if (thread_name.get() == nullptr) {
+    CHECK(IsExceptionPending());
+    return;
+  }
   jint thread_priority = GetNativePriority();
   jboolean thread_is_daemon = as_daemon;