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

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

Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev 

am: 3aa95def

Change-Id: I91526029df58092c93fcf7f727da9afdd0216226
parents 5aea2e36 3aa95def

drm/libmediadrm/CryptoHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ status_t CryptoHal::toSharedBuffer(const sp<IMemory>& memory, int32_t seqNum, :: 
    ssize_t offset;

    size_t size;



    if (memory == NULL && buffer == NULL) {

    if (memory == NULL || buffer == NULL) {

        return UNEXPECTED_NULL;

    }