commit f22c03dee8958edb43d29e857bc2432eaf8c8c3a
author Bryan Ferris <bferris@google.com> Wed Jun 05 16:41:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 05 16:41:17 2019 +0000
tree fd9f92d5907ae250ba9692ad791f65767cf2bcfa
parent 85c1e41520b430bc0cfd6ee8dc0ee289144beb95
parent 8f6013152440a6c245a59fd071dea6b8a251d532

Merge changes from topic "am-100638f4-8d58-47a0-b84b-5e3b7006a2a7" into nyc-mr2-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets. am: f5edb02e9e am: 31bfe0a842 am: f40ecb8468 am: 26b3896f40
  [automerger] [RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets. am: f5edb02e9e am: 31bfe0a842 am: f40ecb8468
  [automerger] [RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets. am: f5edb02e9e am: 31bfe0a842
  [automerger] [RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets. am: f5edb02e9e
  [RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets.

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index e5a34c2..e9c26ea 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1907,8 +1907,8 @@
 
 const char* Parcel::readCString() const
 {
-    const size_t avail = mDataSize-mDataPos;
-    if (avail > 0) {
+    if (mDataPos < mDataSize) {
+        const size_t avail = mDataSize-mDataPos;
         const char* str = reinterpret_cast<const char*>(mData+mDataPos);
         // is the string's trailing NUL within the parcel's valid bounds?
         const char* eos = reinterpret_cast<const char*>(memchr(str, 0, avail));