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

Commit 971c25b0 authored by Casey Dahlin's avatar Casey Dahlin Committed by android-build-merger
Browse files

resolve merge conflicts of 70b9a03d to nyc-mr2-dev-plus-aosp 

am: 29dedec7

Change-Id: I466f01c11ccaf6fe84cbabf4de44bd7485946903
parents 91804d3e 29dedec7

include/binder/Parcel.h

+8 −0
Original line number Diff line number Diff line
@@ -697,8 +697,16 @@ status_t Parcel::unsafeReadTypedVector( 
        return UNEXPECTED_NULL;

    }



    if (val->max_size() < size) {

        return NO_MEMORY;

    }



    val->resize(static_cast<size_t>(size));



    if (val->size() < size) {

        return NO_MEMORY;

    }



    for (auto& v: *val) {

        status = (this->*read_func)(&v);