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

Fix gts issues.

Browse Source 
Fix the conversion from in_args.keyId to Cdm format
which causes nullptr dereference signal 11 faults.

Test: atest
  atest-dev GtsMediaTestCases:com.google.android.media.gts.WidevineGenericOpsTests

Bug: 214410088
Change-Id: If84863e2501d4ccae7b8b38dceb707bb4bfa12fb
This commit is contained in:
Edwin
2022-02-14 10:42:52 -08:00
parent 9654d29be6
commit 93b5514a27
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,8 +147,7 @@ SharedBufferBase::~SharedBufferBase() {
uint8_t* srcPtr = nullptr; uint8_t* srcPtr = nullptr;
void* destPtr = nullptr; void* destPtr = nullptr;
// Convert parameters to the form the CDM wishes to consume them in. // Convert parameters to the form the CDM wishes to consume them in.
const KeyId cryptoKey(reinterpret_cast<const char*>(in_args.keyId.data()), const KeyId cryptoKey(in_args.keyId.begin(), in_args.keyId.end());
wvcdm::KEY_ID_SIZE);
// start scope for lock_guard // start scope for lock_guard
{ {