commit c5867fc78a306e090d42e9f81b5e9ed6e452b708
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 07 16:48:41 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 07 16:48:41 2019 +0000
tree 316be3046ef79fe466eb0522d82406f1476d78dd
parent a1ff64855f6dea29e9b1e12bbbbd3690fdc15b2e
parent 24b6c438d3721b4413110504a0be69e1b0789e74

Snap for 5637977 from 24b6c438d3721b4413110504a0be69e1b0789e74 to qt-aml-release

Change-Id: I206f7ce7185423f63dfbf7ba0944bf32c73f9065

Parcel.cpp

diff --git a/Parcel.cpp b/Parcel.cpp
index 4b61738..d6ea481 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -1324,8 +1324,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));