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

am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev

Browse Source 
* commit 'd386c5be9505d2db24048a6e08ab714f2151dac2':
  Fix heap data leak vulnerability
This commit is contained in:
Jeff Tinker
2015-09-16 18:33:58 +00:00
committed by Android Git Automerger
parent 9860dcdf42 d386c5be95
commit 38281f1cbc
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();
ALOGV("Return value of decrypt() is %d", status);
const int size = reply.readInt32();
(*decBuffer)->length = size;
reply.read((void *)(*decBuffer)->data, size);
if (status == NO_ERROR) {
const int size = reply.readInt32();
(*decBuffer)->length = size;
reply.read((void *)(*decBuffer)->data, size);
}
return status;
}
@@ -1438,9 +1440,11 @@ status_t BnDrmManagerService::onTransact(
reply->writeInt32(status);
const int size = decBuffer->length;
reply->writeInt32(size);
reply->write(decBuffer->data, size);
if (status == NO_ERROR) {
const int size = decBuffer->length;
reply->writeInt32(size);
reply->write(decBuffer->data, size);
}
clearDecryptHandle(&handle);
delete encBuffer; encBuffer = NULL;