commit 4956c0fe1e582a8497aff34a41aeb8bf4748eef0
author Sergio Giro <sgiro@google.com> Thu Aug 20 22:23:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 22:23:47 2015 +0000
tree 6d0fe134e6914d96b7f29e498eabacee781595c4
parent e8582d65ea03a91b5cdc2c374ec9a420f809138f
parent 5b85b1d40d619c2064d321364f212ebfeb6ba185

am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8

* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
  libutils: fix overflow in String8::allocFromUTF8

libutils/String8.cpp

diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index e852d77..e5a48e5 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) {