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

Commit 714a3ab7 authored by Christopher Wiley's avatar Christopher Wiley Committed by Alex Deymo
Browse files

Fix bug in byte vector serialization 

Byte vectors are used by the generated C++ code as the representation
of Java byte[].  This type is serialized as a packed byte array on
the java side.

Bug: 25012838
Test: integration tests for byte[] show this type crossing language
      boundaries correctly.

(cherry picked from commit f0fc52b5)

Change-Id: I0afd4c9655d642613fd9012c7c1e4e9fc4edd1db
parent 930a572e

libs/binder/Parcel.cpp

+20 −22
Original line number Diff line number Diff line
@@ -745,25 +745,25 @@ restart_write: 


status_t Parcel::writeByteVector(const std::vector<int8_t>& val)

{

    status_t status;

    if (val.size() > std::numeric_limits<int32_t>::max()) {

        return BAD_VALUE;

        status = BAD_VALUE;

        return status;

    }



    status_t status = writeInt32(val.size());



    status = writeInt32(val.size());

    if (status != OK) {

        return status;

    }



    for (const auto& item : val) {

        status = writeByte(item);



        if (status != OK) {

    void* data = writeInplace(val.size());

    if (!data) {

        status = BAD_VALUE;

        return status;

    }

    }



    return OK;

    memcpy(data, val.data(), val.size());

    return status;

}



status_t Parcel::writeInt32Vector(const std::vector<int32_t>& val)
@@ -1367,21 +1367,19 @@ status_t Parcel::readByteVector(std::vector<int8_t>* val) const { 
        return status;

    }



    if (size < 0) {

        return BAD_VALUE;

    }



    val->resize(size);



    for (auto& v : *val) {

        status = readByte(&v);



        if (status != OK) {

    if (size < 0 || size_t(size) > dataAvail()) {

        status = BAD_VALUE;

        return status;

    }

    const void* data = readInplace(size);

    if (!data) {

        status = BAD_VALUE;

        return status;

    }

    val->resize(size);

    memcpy(val->data(), data, size);



    return OK;

    return status;

}



status_t Parcel::readInt32Vector(std::vector<int32_t>* val) const {