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

Commit 1de147c6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4404534 from 2921de78 to oc-mr1-release 

Change-Id: I0b8d5b04b7c42f3b46b1a036d95cc1cc352ec431
parents 75a3d98b 2921de78

drm/libmediadrm/IDrm.cpp

+7 −2
Original line number Diff line number Diff line
@@ -561,8 +561,13 @@ IMPLEMENT_META_INTERFACE(Drm, "android.drm.IDrm"); 


void BnDrm::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 BnDrm::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {

media/libstagefright/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -4697,6 +4697,8 @@ status_t MPEG4Source::read( 
        }

        if (size > mBuffer->size()) {

            ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());

            mBuffer->release();

            mBuffer = NULL;

            return ERROR_BUFFER_TOO_SMALL;

        }

    }
@@ -4989,6 +4991,8 @@ status_t MPEG4Source::fragmentedRead( 
        }

        if (size > mBuffer->size()) {

            ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());

            mBuffer->release();

            mBuffer = NULL;

            return ERROR_BUFFER_TOO_SMALL;

        }

    }

media/libstagefright/codecs/m4v_h263/dec/src/vlc_decode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ int PV_VlcDecMCBPC_com_inter_H263(BitstreamDecVideo *stream) 


    BitstreamShow13Bits(stream, &code);



    if (code == 0)

    if (code < 8)

    {

        return VLC_CODE_ERROR;

    }