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

Check for null pointers in oemcrypto adapter am: 42eb79a3ff

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I01d29869ce9f1ce6c252066cbb8f9b4f5286a5ef
This commit is contained in:
Fred Gylys-Colwell
2020-06-02 21:49:21 +00:00
committed by Automerger Merge Worker
parent 62802d8e10 42eb79a3ff
commit 7a4313483c
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);