commit cf1f99e2b6b8dd5061395d19e7271b0f460200cf
author Steven Moreland <smoreland@google.com> Wed Oct 25 03:04:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 25 03:04:58 2017 +0000
tree f4fc21363c16a165e3f6583c317ac987a1a0273e
parent 6d1c35650b163371babf7c81564a000bf49c0488
parent e949257f03552a0d3667ad393c532473ee4eb503

Merge "Fix copyFrom overflow when arg is UINT32_MAX."
am: e949257f03

Change-Id: Ic3a2b9c25d99b5316b726043dadea7d8eb949636

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index f857281..aec3fed 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -217,7 +217,7 @@
 void hidl_string::copyFrom(const char *data, size_t size) {
     // assume my resources are freed.
 
-    if (size > UINT32_MAX) {
+    if (size >= UINT32_MAX) {
         LOG(FATAL) << "string size can't exceed 2^32 bytes: " << size;
     }
     char *buf = (char *)malloc(size + 1);