Snap for 6289358 from e6df50aa5e to sc-release

Change-Id: Ib6114562d1a117eaff901f5a8509f7ced7471025
2020-03-13 02:15:34 +00:00
parent e6f39d54cc e6df50aa5e
commit 0948dc3cfa
1 changed files with 1 additions and 1 deletions
--- a/libwvdrmengine/oemcrypto/renewal/derive_key.cpp
+++ b/libwvdrmengine/oemcrypto/renewal/derive_key.cpp
@@ -85,7 +85,7 @@ static std::string GetSSLError() {
 static bool DeriveKey(const std::vector<uint8_t>& key,
                      const std::vector<uint8_t>& context,
                      std::vector<uint8_t>* out) {
-  if (key.empty() || context.empty() || out == NULL) {
+  if (key.empty() || context.empty() || out == nullptr) {
    std::cerr << "DeriveKey(): Invalid inputs" << std::endl;
    return false;
  }