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

Commit d10d7e15 authored by Zhizhou Yang's avatar Zhizhou Yang Committed by android-build-merger
Browse files

Merge "Fix memory leak warning in FwdLockEngine.cpp" am: 809ea9d9 

am: b5c1bcb9

Change-Id: Ibe3b720e58ef87eaa0c30bd9052e752fbf363fbc
parents ed1da62e b5c1bcb9

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp

+8 −4
Original line number Diff line number Diff line
@@ -502,8 +502,8 @@ status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */, 
        int retVal = FwdLockFile_CheckHeaderIntegrity(fileDesc);

        DecodeSession* decodeSession = new DecodeSession(fileDesc);



        if (retVal && NULL != decodeSession) {

            decodeSessionMap.addValue(decryptHandle->decryptId, decodeSession);

        if (retVal && NULL != decodeSession &&

            decodeSessionMap.addValue(decryptHandle->decryptId, decodeSession)) {

            const char *pmime= FwdLockFile_GetContentType(fileDesc);

            String8 contentType = String8(pmime == NULL ? "" : pmime);

            contentType.toLower();
@@ -513,7 +513,11 @@ status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */, 
            decryptHandle->decryptInfo = NULL;

            result = DRM_NO_ERROR;

        } else {

            if (retVal && NULL != decodeSession) {

              LOG_VERBOSE("FwdLockEngine::onOpenDecryptSession Integrity Check failed for the fd");

            } else {

              LOG_VERBOSE("FwdLockEngine::onOpenDecryptSession DecodeSesssion insertion failed");

            }

            FwdLockFile_detach(fileDesc);

            delete decodeSession;

        }