Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors"
am: cf9944684f
* commit 'cf9944684f438a1c3a47ab16c3efa4fa5d57f921':
system_server BINDER_TYPE_FD sockets using ashmem accessors
diff --git a/Parcel.cpp b/Parcel.cpp
index 3acd869..6893e39 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -384,13 +384,11 @@
size_t Parcel::dataAvail() const
{
- // TODO: decide what to do about the possibility that this can
- // report an available-data size that exceeds a Java int's max
- // positive value, causing havoc. Fortunately this will only
- // happen if someone constructs a Parcel containing more than two
- // gigabytes of data, which on typical phone hardware is simply
- // not possible.
- return dataSize() - dataPosition();
+ size_t result = dataSize() - dataPosition();
+ if (result > INT32_MAX) {
+ abort();
+ }
+ return result;
}
size_t Parcel::dataPosition() const