diff options
| author | Sergio Giro <sgiro@google.com> | 2015-08-18 14:44:54 +0100 |
|---|---|---|
| committer | ] <sgiro@google.com> | 2015-08-18 18:06:38 +0100 |
| commit | ebabef275283f771151ec93c17469374b789b2c8 (patch) | |
| tree | bfd80fa501af3c1e894a4c9d76ae5d246dd2473e /libutils | |
| parent | 8104616696ac5e806b16a393ea02c4f5d8efc328 (diff) | |
| download | system_core-ebabef275283f771151ec93c17469374b789b2c8.tar.gz system_core-ebabef275283f771151ec93c17469374b789b2c8.tar.bz2 system_core-ebabef275283f771151ec93c17469374b789b2c8.zip | |
libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
(cherry picked from commit 4eeacbeec0ae66e9d9395abbf83666709f2e11e3)
Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/String8.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libutils/String8.cpp b/libutils/String8.cpp index 3323b82a5..149660231 100644 --- 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) { |