commit 445120568460cae68d37a27ac39477fbf20952fc
author Vladimir Marko <vmarko@google.com> Wed Nov 12 15:41:57 2014 +0000
committer Vladimir Marko <vmarko@google.com> Wed Nov 12 16:03:21 2014 +0000
tree 0b36b90a5fe22ab58d220b282f9fd34c9d7a3e31
parent 59321e0e10ea09694efecf6154704e2743b9bffd

Fix bad OOM check in Thread::CreatePeer().

Bug: 18342629

(cherry picked from commit 7bcea103af7cd130254835a30b45d5277a478074)

Change-Id: I5d5c7511bbc705d040095f4934d98d326d54d39e

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index cb3da8b..c769faf 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -442,7 +442,7 @@
   }
   ScopedLocalRef<jobject> thread_name(env, env->NewStringUTF(name));
   // Add missing null check in case of OOM b/18297817
-  if (thread_name.get() == nullptr) {
+  if (name != nullptr && thread_name.get() == nullptr) {
     CHECK(IsExceptionPending());
     return;
   }