commit ba71601aacb3846d7c83cfc89fff689e1b774c54
author Sergio Giro <sgiro@google.com> Tue Aug 18 17:19:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 17:19:10 2015 +0000
tree f49ba9db4447777b801a2620fb40ad42229502ce
parent 8e9a1ae5936d2bfae23dc0f7414a68973a894209
parent 29c1275519ef85fa3f30be351f19dc6e7eedbee9

am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev

* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9':
  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) {