ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '1d44be87ffdc5e3bc074ab68200bff9d32c60d3a':
  libutils: fix overflow in String8::allocFromUTF8
This commit is contained in:
Sergio Giro 2015-08-18 17:21:11 +00:00 • committed by Android Git Automerger
commit f468d1e14c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libutils/String8.cpp
View file

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