| commit | a346e69406031657ccacbd580cdb36d43998e395 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Oct 10 04:15:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 10 04:15:42 2024 +0000 |
| tree | c2a4df5e43f824b8eac4ea01c76d28f518f6249e | |
| parent | 2d82af65b46de88f44c44db89e8f2fd090ee3d2d [diff] | |
| parent | 1456474eb432839806167248fbcf2c2283a0dda3 [diff] |
Merge "libbinder Parcel: Fix ubsan error in readData" into main am: 1456474eb4 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3300095 Change-Id: If10024d3d45d4f6c75de643e0bcf0b248c6b2415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index c394ac7..15a0da7 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h
@@ -1240,7 +1240,7 @@ if (__builtin_mul_overflow(size, sizeof(T), &dataLen)) { return -EOVERFLOW; } - auto data = reinterpret_cast<const T*>(readInplace(dataLen)); + auto data = readInplace(dataLen); if (data == nullptr) return BAD_VALUE; // std::vector::insert and similar methods will require type-dependent // byte alignment when inserting from a const iterator such as `data`,