Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a346e694 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3300095



Change-Id: If10024d3d45d4f6c75de643e0bcf0b248c6b2415
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d82af65 1456474e

libs/binder/include/binder/Parcel.h

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ private: 
            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`,