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

Commit 2edc329d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix null pointer derefernce AMediaDrm_setPropertyByteArray" am:... 

Merge "Fix null pointer derefernce AMediaDrm_setPropertyByteArray" am: b06ffd2b am: f7b34733 am: 886a6634 am: 5a20a591

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2449811



Change-Id: I075ae8b6075612dd5c0874c2fe49d3dc276b5163
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fff47d43 5a20a591

media/ndk/NdkMediaDrm.cpp

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

media_status_t AMediaDrm_setPropertyByteArray(AMediaDrm *mObj,

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

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

        return AMEDIA_ERROR_INVALID_OBJECT;

    }



    Vector<uint8_t> byteArray;

    byteArray.appendArray(value, valueSize);