commit 7e071762cbaddbe8de87a0445bdee7db6a620f53
author The Android Automerger <android-build@google.com> Wed Aug 19 01:09:15 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 19 01:09:15 2015 -0700
tree 9f3d5c21238ab388631036772ba2715cfe1f13b0
parent 29c1275519ef85fa3f30be351f19dc6e7eedbee9
parent 57224c5cff69ff66525c6a46d23ff7b6a08f3437

merge in mnc-release history after reset to mnc-dev

libutils/String8.cpp

diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 3323b82..1496602 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -78,6 +78,9 @@
 static char* allocFromUTF8(const char* in, size_t len)
 {
     if (len > 0) {
+        if (len == SIZE_MAX) {
+            return NULL;
+        }
         SharedBuffer* buf = SharedBuffer::alloc(len+1);
         ALOG_ASSERT(buf, "Unable to allocate shared buffer");
         if (buf) {