commit bb7c97901066b0dfc28eed8843fcd64473cb9d0e
author Sergio Giro <sgiro@google.com> Thu Aug 20 22:58:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 22:58:19 2015 +0000
tree 9e49719e942355ecb6a1e46e73d4a291ce4edf19
parent a44caf4048ef3ea29c7d7210d6f38d9087f7a2ea
parent e97682be0634fe773f70097bc518e5d034efe8f7

am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8

* commit 'e97682be0634fe773f70097bc518e5d034efe8f7':
  libutils: fix overflow in String8::allocFromUTF8

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) {