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

* commit 'f468d1e14c0bb777d557a6a86dead260e40ff8aa':
  libutils: fix overflow in String8::allocFromUTF8
This commit is contained in:
Sergio Giro 2015-08-18 17:25:33 +00:00 committed by Android Git Automerger
commit c4abbcbdde

View file

@ -79,6 +79,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) {