Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfde572 authored by Sergio Giro's avatar Sergio Giro Committed by Android Git Automerger
Browse files

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

* commit '29c12755':
  libutils: fix overflow in String8::allocFromUTF8
parents fe1b4627 29c12755

libutils/String8.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,9 @@ void terminate_string8() 
static char* allocFromUTF8(const char* in, size_t len)

static char* allocFromUTF8(const char* in, size_t len)

{

{

    if (len > 0) {

    if (len > 0) {

        if (len == SIZE_MAX) {

            return NULL;

        }

        SharedBuffer* buf = SharedBuffer::alloc(len+1);

        SharedBuffer* buf = SharedBuffer::alloc(len+1);

        ALOG_ASSERT(buf, "Unable to allocate shared buffer");

        ALOG_ASSERT(buf, "Unable to allocate shared buffer");

        if (buf) {

        if (buf) {