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

Merge "Fix heap data leak vulnerability" into klp-dev

Browse Source
This commit is contained in:
Jeff Tinker
2015-09-16 18:17:46 +00:00
committed by Android (Google) Code Review
parent b21a642067 09ed70fab1
commit d386c5be95
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drm/common/IDrmManagerService.cpp
View File

@@ -741,9 +741,11 @@ status_t BpDrmManagerService::decrypt(
const status_t status = reply.readInt32(); const status_t status = reply.readInt32();
ALOGV("Return value of decrypt() is %d", status); ALOGV("Return value of decrypt() is %d", status);
const int size = reply.readInt32(); if (status == NO_ERROR) {
(*decBuffer)->length = size; const int size = reply.readInt32();
reply.read((void *)(*decBuffer)->data, size); (*decBuffer)->length = size;
reply.read((void *)(*decBuffer)->data, size);
}
return status; return status;
} }
@@ -1438,9 +1440,11 @@ status_t BnDrmManagerService::onTransact(
reply->writeInt32(status); reply->writeInt32(status);
const int size = decBuffer->length; if (status == NO_ERROR) {
reply->writeInt32(size); const int size = decBuffer->length;
reply->write(decBuffer->data, size); reply->writeInt32(size);
reply->write(decBuffer->data, size);
}
clearDecryptHandle(&handle); clearDecryptHandle(&handle);
delete encBuffer; encBuffer = NULL; delete encBuffer; encBuffer = NULL;