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

Commit b06ffd2b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix null pointer derefernce AMediaDrm_setPropertyByteArray"

parents d98fd9c2 fc5c0f87

media/ndk/NdkMediaDrm.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -758,6 +758,9 @@ media_status_t AMediaDrm_setPropertyString(AMediaDrm *mObj, 
EXPORT

EXPORT

media_status_t AMediaDrm_setPropertyByteArray(AMediaDrm *mObj,

media_status_t AMediaDrm_setPropertyByteArray(AMediaDrm *mObj,

        const char *propertyName, const uint8_t *value, size_t valueSize) {

        const char *propertyName, const uint8_t *value, size_t valueSize) {

    if (!mObj || mObj->mDrm == NULL) {

        return AMEDIA_ERROR_INVALID_OBJECT;

    }





    Vector<uint8_t> byteArray;

    Vector<uint8_t> byteArray;

    byteArray.appendArray(value, valueSize);

    byteArray.appendArray(value, valueSize);