widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wv aidl: fix native handle memory leak

Browse Source 
[ Merge of go/wvgerrit/145971 ]

Bug: 219754570
Test: atest GtsMediaTestCases
Change-Id: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
Merged-In: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
This commit is contained in:
Robert Shih
2022-02-16 13:35:09 -08:00
parent 93b5514a27
commit c6d7d6e69b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
View File

@@ -144,6 +144,7 @@ SharedBufferBase::~SharedBufferBase() {
const char* detailedError = "";
*_aidl_return = 0; // bytes decrypted
native_handle_t* handle = nullptr;
uint8_t* srcPtr = nullptr;
void* destPtr = nullptr;
// Convert parameters to the form the CDM wishes to consume them in.
@@ -159,6 +160,7 @@ SharedBufferBase::~SharedBufferBase() {
}
const auto NON_SECURE = DestinationBuffer::Tag::nonsecureMemory;
const auto SECURE = DestinationBuffer::Tag::secureMemory;
if (in_args.destination.getTag() == NON_SECURE) {
const SharedBuffer& dest = in_args.destination.get<NON_SECURE>();
if (mSharedBufferMap.find(dest.bufferId) == mSharedBufferMap.end()) {
@@ -218,10 +220,8 @@ SharedBufferBase::~SharedBufferBase() {
}
destPtr = static_cast<void*>(
dest->mBase + in_args.destination.get<NON_SECURE>().offset);
} else if (in_args.destination.getTag() ==
DestinationBuffer::Tag::secureMemory) {
native_handle_t* handle = android::makeFromAidl(
in_args.destination.get<DestinationBuffer::Tag::secureMemory>());
} else if (in_args.destination.getTag() == SECURE) {
handle = android::makeFromAidl(in_args.destination.get<SECURE>());
destPtr = static_cast<void*>(handle);
}
} // lock_guard scope
@@ -276,6 +276,7 @@ SharedBufferBase::~SharedBufferBase() {
// Decrypt
std::string errorDetailMsg;
Status res = attemptDecrypt(params, hasProtectedData, &errorDetailMsg);
native_handle_delete(handle);
if (res != Status::OK) {
detailedError = errorDetailMsg.data();
return toNdkScopedAStatus(res, detailedError);