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

Commit 973c041e authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix information disclosure in mediadrmserver" into oc-dev am:... 

Merge "Fix information disclosure in mediadrmserver" into oc-dev am: f452267a am: dd57ac5b am: f19106c7
am: 22fca9cd

Change-Id: I10fa28da314ccb29d95fd5beee09d372b1e614d1
parents 1d6702f5 22fca9cd

drm/libmediadrm/ICrypto.cpp

+7 −2
Original line number Diff line number Diff line
@@ -225,8 +225,13 @@ IMPLEMENT_META_INTERFACE(Crypto, "android.hardware.ICrypto"); 


void BnCrypto::readVector(const Parcel &data, Vector<uint8_t> &vector) const {

    uint32_t size = data.readInt32();

    vector.insertAt((size_t)0, size);

    data.read(vector.editArray(), size);

    if (vector.insertAt((size_t)0, size) < 0) {

        vector.clear();

    }

    if (data.read(vector.editArray(), size) != NO_ERROR) {

        vector.clear();

        android_errorWriteWithInfoLog(0x534e4554, "62872384", -1, NULL, 0);

    }

}



void BnCrypto::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {