commit 05fc5e04f06e5e7f99921fa0eb1edb4c97a21bf9
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 efe351953f29101f6f5fc827af7a4de629659a61
parent d0d4b584fc294d2c124385644099852918416344
parent f5edb02e9e96de8ff29bc4369d6dd6681ec0d7cf

Merge "[RESTRICT AUTOMERGE] libbinder: Status: check dataPosition sets." into nyc-dev

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));