commit 2da37004f45176cff2cec026eee6c802067d23e0
author Sergio Giro <sgiro@google.com> Tue Aug 18 17:25:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 17:25:33 2015 +0000
tree 9dc5f9e200d91874af12e05dc51ee00dc121d399
parent 805b80339508df3febe2b96a48b55fadc758f761
parent ef5a8424ecccff18570542328f594ac21eb65044

am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"

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

libutils/String8.cpp

diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 28be60f..69313ea 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -79,6 +79,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) {