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

Fix errors being hidden by Protobuf warning-disabling

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

This patch fixes a number of minor issues in the codebase (mostly
instances of 0-as-nullptr, but also some member shadowing and a missing
override) that were being hidden by the fact that depending on Protobuf
disables these diagnostics. And which will be unhidden when a later
patch removes that behavior from Protobuf.

Bug: 208304830
Test: x86-64
Change-Id: I4b0b1264748880b3726a6388d589868d898f949e
This commit is contained in:
John "Juce" Bruce
2021-12-15 10:34:31 -08:00
committed by John Bruce
parent 5606e7dae3
commit df23c7da03
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/test/http_socket_test.cpp
View File

@@ -30,7 +30,7 @@ const int kTimeout = 3000;
class HttpSocketTest : public testing::Test {
public:
HttpSocketTest() {}
~HttpSocketTest() {}
~HttpSocketTest() override {}
protected:
bool Connect(const std::string& server_url) {
@@ -164,7 +164,7 @@ ParseUrlTests parse_url_tests[] = {
"8888", // port
"/", // path
},
{nullptr, nullptr, false, nullptr, 0, nullptr} // list terminator
{} // list terminator
};
TEST_F(HttpSocketTest, ParseUrlTest) {

9
libwvdrmengine/cdm/core/test/license_unittest.cpp
View File

@@ -535,9 +535,12 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidationV15) {
}
struct EntitledKeyVariant {
EntitledKeyVariant(const char* name, const std::string& key,
bool should_succeed)
: name(name), key(key), should_succeed(should_succeed) {}
EntitledKeyVariant(const char* name_param, const std::string& key_param,
bool should_succeed_param)
: name(name_param),
key(key_param),
should_succeed(should_succeed_param) {}
const std::string name;
const std::string key;
const bool should_succeed;

2
libwvdrmengine/cdm/core/test/test_base.cpp
View File

@@ -764,7 +764,7 @@ bool TestLicenseHolder::DeriveKey(const std::vector<uint8_t>& key,
return false;
}
if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, 0)) {
if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, nullptr)) {
LOGE("DeriveKey(): CMAC_Init");
CMAC_CTX_free(cmac_ctx);
return false;

2
libwvdrmengine/oemcrypto/test/oec_key_deriver.cpp
View File

@@ -95,7 +95,7 @@ void KeyDeriver::DeriveKey(const uint8_t* key, const vector<uint8_t>& context,
CMAC_CTX* cmac_ctx = CMAC_CTX_new();
ASSERT_NE(nullptr, cmac_ctx);
ASSERT_TRUE(CMAC_Init(cmac_ctx, key, KEY_SIZE, cipher, 0));
ASSERT_TRUE(CMAC_Init(cmac_ctx, key, KEY_SIZE, cipher, nullptr));
std::vector<uint8_t> message;
message.push_back(static_cast<uint8_t>(counter));

4
libwvdrmengine/oemcrypto/test/oec_session_util.cpp
View File

@@ -1273,7 +1273,7 @@ Session::Session()
forced_session_id_(false),
session_id_(0),
nonce_(0),
public_rsa_(0) {}
public_rsa_(nullptr) {}
Session::~Session() {
if (!forced_session_id_ && open_) close();
@@ -1470,7 +1470,7 @@ void Session::LoadOEMCert(bool verify_cert) {
reinterpret_cast<const unsigned char*>(public_cert.data());
long cert_size = static_cast<long>(public_cert.size());
boringssl_ptr<PKCS7, PKCS7_free> pkcs7(
d2i_PKCS7(NULL, &cert_data, cert_size));
d2i_PKCS7(nullptr, &cert_data, cert_size));
ASSERT_TRUE(pkcs7.NotNull()) << "Error parsing PKCS7 message";
ASSERT_TRUE(PKCS7_type_is_signed(pkcs7.get()))
<< "Unexpected PKCS7 message type";