commit 1456474eb432839806167248fbcf2c2283a0dda3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 10 04:03:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 04:03:41 2024 +0000
tree 00bdac3c921b14f8a543cdadbe7e11e8bdbe4c5e
parent 1750d7f8b9e15b6e3617234ea41b3940bb0f550c
parent b61a07068ae78e55ddb1ac0d8b100ce522927a3d

Merge "libbinder Parcel: Fix ubsan error in readData" into main

libs/binder/include/binder/Parcel.h

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`,