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

Use nullptr in more places

Browse Source 
(This is a merge of http://go/wvgerrit/139630.)

This patch fixes a few places that were using NULL or 0 instead of
nullptr.

Bug: 207702482
Test: x86-64 build
Change-Id: I10e19febebd093fe4445208a082216002d9a4482
This commit is contained in:
John "Juce" Bruce
2021-12-01 11:58:05 -08:00
parent bfd299a4be
commit c43b9fc3de
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp
View File

@@ -324,7 +324,7 @@ bool ExtractExtensionValueFromCertificate(const std::string& cert,
reinterpret_cast<const unsigned char*>(cert.data()); reinterpret_cast<const unsigned char*>(cert.data());
long cert_size = static_cast<long>(cert.size()); long cert_size = static_cast<long>(cert.size());
boringssl_ptr<PKCS7, PKCS7_free> pkcs7( boringssl_ptr<PKCS7, PKCS7_free> pkcs7(
d2i_PKCS7(NULL, &cert_data, cert_size)); d2i_PKCS7(nullptr, &cert_data, cert_size));
if (!pkcs7) { if (!pkcs7) {
LOGE("Error parsing PKCS7 message"); LOGE("Error parsing PKCS7 message");
return false; return false;

2
libwvdrmengine/oemcrypto/test/oec_session_util.h
View File

@@ -602,7 +602,7 @@ class Session {
// order to verify signatures. // order to verify signatures.
void GenerateReport(const std::string& pst, void GenerateReport(const std::string& pst,
OEMCryptoResult expected_result = OEMCrypto_SUCCESS, OEMCryptoResult expected_result = OEMCrypto_SUCCESS,
Session* other = 0); Session* other = nullptr);
// Move this usage entry to a new index. // Move this usage entry to a new index.
void MoveUsageEntry(uint32_t new_index, std::vector<uint8_t>* header_buffer, void MoveUsageEntry(uint32_t new_index, std::vector<uint8_t>* header_buffer,
OEMCryptoResult expect_result = OEMCrypto_SUCCESS); OEMCryptoResult expect_result = OEMCrypto_SUCCESS);