diff options
| author | Sergio Giro <sgiro@google.com> | 2015-08-18 17:19:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 17:19:10 +0000 |
| commit | ba71601aacb3846d7c83cfc89fff689e1b774c54 (patch) | |
| tree | f49ba9db4447777b801a2620fb40ad42229502ce /libutils/String8.cpp | |
| parent | 8e9a1ae5936d2bfae23dc0f7414a68973a894209 (diff) | |
| parent | 29c1275519ef85fa3f30be351f19dc6e7eedbee9 (diff) | |
am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9':
libutils: fix overflow in String8::allocFromUTF8
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 28be60fb5..69313ead7 100644 --- a/libutils/String8.cpp +++ b/libutils/String8.cpp @@ -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) { |