diff options
author | Steven Moreland <smoreland@google.com> | 2022-06-10 19:43:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-10 19:43:31 +0000 |
commit | 83562e55fb1998bb170a90a591fbe6228eb02756 (patch) | |
tree | 57971a5e5fcbdb93261aad2db42dca23f8f81bc4 | |
parent | 7f2538de591f82f74b5c4f09e53912d2029f729c (diff) | |
parent | c25cfc6c8fe92fd92875a4d7717bbfe8f1bbdd48 (diff) | |
download | native-83562e55fb1998bb170a90a591fbe6228eb02756.tar.gz |
Merge "libbinder: Status - fix read at end of Parcel" am: c25cfc6c8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2117835
Change-Id: I44f06a4249df0d62e04f9931633710071f3f0df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libs/binder/Status.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp index 83b97d04c6..dba65878fb 100644 --- a/libs/binder/Status.cpp +++ b/libs/binder/Status.cpp @@ -139,6 +139,9 @@ status_t Status::readFromParcel(const Parcel& parcel) { mMessage = String8(message.value_or(String16())); // Skip over the remote stack trace data + const size_t remote_start = parcel.dataPosition(); + // Get available size before reading more + const size_t remote_avail = parcel.dataAvail(); int32_t remote_stack_trace_header_size; status = parcel.readInt32(&remote_stack_trace_header_size); if (status != OK) { @@ -146,13 +149,16 @@ status_t Status::readFromParcel(const Parcel& parcel) { return status; } if (remote_stack_trace_header_size < 0 || - static_cast<size_t>(remote_stack_trace_header_size) > parcel.dataAvail()) { + static_cast<size_t>(remote_stack_trace_header_size) > remote_avail) { android_errorWriteLog(0x534e4554, "132650049"); setFromStatusT(UNKNOWN_ERROR); return UNKNOWN_ERROR; } - parcel.setDataPosition(parcel.dataPosition() + remote_stack_trace_header_size); + + if (remote_stack_trace_header_size != 0) { + parcel.setDataPosition(remote_start + remote_stack_trace_header_size); + } if (mException == EX_SERVICE_SPECIFIC) { status = parcel.readInt32(&mErrorCode); |