diff options
| author | Sergio Giro <sgiro@google.com> | 2015-08-18 14:44:54 +0100 |
|---|---|---|
| committer | Jon Larimer <jlarimer@google.com> | 2015-08-18 20:52:25 +0000 |
| commit | 5b85b1d40d619c2064d321364f212ebfeb6ba185 (patch) | |
| tree | d06789741c03944ee138c185a1f79fc79ad07c17 /libutils/String8.cpp | |
| parent | 9bd7afc0a1de9589c13355178b6edc709bd0bddf (diff) | |
| download | system_core-5b85b1d40d619c2064d321364f212ebfeb6ba185.zip system_core-5b85b1d40d619c2064d321364f212ebfeb6ba185.tar.gz system_core-5b85b1d40d619c2064d321364f212ebfeb6ba185.tar.bz2 | |
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
(cherry picked from commit ebabef275283f771151ec93c17469374b789b2c8)
Diffstat (limited to 'libutils/String8.cpp')
| -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 e852d77..e5a48e5 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) { |