commit 04e983a83113d8321d45e1915f4aa9f4bd619647
author Mathieu Chartier <mathieuc@google.com> Fri Nov 13 08:36:59 2015 -0800
committer Mathieu Chartier <mathieuc@google.com> Fri Nov 13 08:54:57 2015 -0800
tree a3360aa479144b23b988d3ca7f294eb19cfd22d2
parent 2f49b0a90720fe9f4cab040c376aab5f387967e3

Revert "Revert "Add missing null check to String::ToCharArray""

Fix flaky test.

Bug: 25641543

This reverts commit b52a39c76e0cb0638c92cdcf6b5c5aa551420e1a.

Change-Id: I6b0d3087dba3680252e65af554530e2769cde55c

runtime/mirror/string.cc

diff --git a/runtime/mirror/string.cc b/runtime/mirror/string.cc
index 45610dc..be869d4 100644
--- a/runtime/mirror/string.cc
+++ b/runtime/mirror/string.cc
@@ -254,7 +254,11 @@
   StackHandleScope<1> hs(self);
   Handle<String> string(hs.NewHandle(this));
   CharArray* result = CharArray::Alloc(self, GetLength());
-  memcpy(result->GetData(), string->GetValue(), string->GetLength() * sizeof(uint16_t));
+  if (result != nullptr) {
+    memcpy(result->GetData(), string->GetValue(), string->GetLength() * sizeof(uint16_t));
+  } else {
+    self->AssertPendingOOMException();
+  }
   return result;
 }