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

* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9': libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:20:00 +00:00 · 2015-08-18 17:20:00 +00:00 · 2bfde57237
parent fe1b462765 29c1275519
commit 2bfde57237
1 changed files with 3 additions and 0 deletions
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@ -78,6 +78,9 @@ void terminate_string8()
 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) {