gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix memory leak warning in FwdLockEngine.cpp"

Browse Source 
am: 809ea9d9cc

Change-Id: Id83653de65130ab3f73a720d9196d5ae47ec9613
gugelfrei
Zhizhou Yang 7 years ago committed by android-build-merger
parent 70b1b40071 809ea9d9cc
commit b5c1bcb963
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

12
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
Unescape View File

@ -502,8 +502,8 @@ status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */,
int retVal = FwdLockFile_CheckHeaderIntegrity(fileDesc); int retVal = FwdLockFile_CheckHeaderIntegrity(fileDesc);
DecodeSession* decodeSession = new DecodeSession(fileDesc); DecodeSession* decodeSession = new DecodeSession(fileDesc);
if (retVal && NULL != decodeSession) { if (retVal && NULL != decodeSession &&
decodeSessionMap.addValue(decryptHandle->decryptId, decodeSession); decodeSessionMap.addValue(decryptHandle->decryptId, decodeSession)) {
const char *pmime= FwdLockFile_GetContentType(fileDesc); const char *pmime= FwdLockFile_GetContentType(fileDesc);
String8 contentType = String8(pmime == NULL ? "" : pmime); String8 contentType = String8(pmime == NULL ? "" : pmime);
contentType.toLower(); contentType.toLower();
@ -513,7 +513,11 @@ status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */,
decryptHandle->decryptInfo = NULL; decryptHandle->decryptInfo = NULL;
result = DRM_NO_ERROR; result = DRM_NO_ERROR;
} else { } else {
LOG_VERBOSE("FwdLockEngine::onOpenDecryptSession Integrity Check failed for the fd"); 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); FwdLockFile_detach(fileDesc);
delete decodeSession; delete decodeSession;
} }
@ -631,7 +635,7 @@ ssize_t FwdLockEngine::onRead(int /* uniqueId */,
ssize_t size = -1; ssize_t size = -1;
if (NULL != decryptHandle && if (NULL != decryptHandle &&
decodeSessionMap.isCreated(decryptHandle->decryptId) && decodeSessionMap.isCreated(decryptHandle->decryptId) &&
NULL != buffer && NULL != buffer &&
numBytes > -1) { numBytes > -1) {
DecodeSession* session = decodeSessionMap.getValue(decryptHandle->decryptId); DecodeSession* session = decodeSessionMap.getValue(decryptHandle->decryptId);

Write Preview
Loading…
Cancel
Save