commit e67b584869eea8d4e955e82de1e38ede080a2ed4
author Sergio Giro <sgiro@google.com> Thu Aug 20 22:28:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 22:28:53 2015 +0000
tree a687aebb5a6a03eaf291ae5f25d6ea4d46332dab
parent 058ad0b6612457c54c7ad6e3b5d5a618d94ae966
parent 4956c0fe1e582a8497aff34a41aeb8bf4748eef0

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

* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
  libutils: fix overflow in String8::allocFromUTF8

libutils/String8.cpp

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