diff options
| author | Sergio Giro <sgiro@google.com> | 2015-08-18 17:15:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 17:15:11 +0000 |
| commit | 29c1275519ef85fa3f30be351f19dc6e7eedbee9 (patch) | |
| tree | 9f3d5c21238ab388631036772ba2715cfe1f13b0 /libutils/String8.cpp | |
| parent | 19f223f3cfe43a4ded903a5d6a5f07bbadf115f5 (diff) | |
| parent | ebabef275283f771151ec93c17469374b789b2c8 (diff) | |
Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
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 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) { |