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

Commit 32d0a2b8 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Check mDataPos to see if the Parcel needs to grow am: 5a247775 am: 603c54b4 

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



Change-Id: I91e20f0afda84db091c1434d5c34f98232e54197
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a1bfc22 603c54b4

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
        return BAD_VALUE;

    }



    if ((mDataSize+len) > mDataCapacity) {

    if ((mDataPos + len) > mDataCapacity) {

        // grow data

        err = growData(len);

        if (err != NO_ERROR) {

libs/binder/tests/binderParcelUnitTest.cpp

+11 −0
Original line number Diff line number Diff line
@@ -112,6 +112,17 @@ TEST(Parcel, DebugReadAllFds) { 
    EXPECT_EQ(ret[1], STDIN_FILENO);

}



TEST(Parcel, AppendWithBadDataPos) {

    Parcel p1;

    p1.writeInt32(1);

    p1.writeInt32(1);

    Parcel p2;

    p2.setDataCapacity(8);

    p2.setDataPosition(10000);



    EXPECT_EQ(android::BAD_VALUE, p2.appendFrom(&p1, 0, 8));

}



// Tests a second operation results in a parcel at the same location as it

// started.

void parcelOpSameLength(const std::function<void(Parcel*)>& a, const std::function<void(Parcel*)>& b) {