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

Check for null pointers in oemcrypto adapter

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/100963

Test: unit tests on taimen
Bug: 156967805
Change-Id: Ic8ba7461ffcaa371a5239dca84e8a3007b0df517
This commit is contained in:
Fred Gylys-Colwell
2020-05-30 20:48:00 -07:00
parent 166b3e8403
commit 42eb79a3ff
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -754,6 +754,10 @@ class Adapter {
LOOKUP_ALL(8, Initialize, OEMCrypto_Initialize); LOOKUP_ALL(8, Initialize, OEMCrypto_Initialize);
LOOKUP_ALL(8, APIVersion, OEMCrypto_APIVersion); LOOKUP_ALL(8, APIVersion, OEMCrypto_APIVersion);
LOOKUP_ALL(8, Terminate, OEMCrypto_Terminate); LOOKUP_ALL(8, Terminate, OEMCrypto_Terminate);
if (level1_.Initialize == nullptr || level1_.APIVersion == nullptr ||
level1_.Terminate == nullptr) {
level1_valid_ = false;
}
if (!level1_valid_) { if (!level1_valid_) {
metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode( metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_INVALID_L1); wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_INVALID_L1);