From 5cd0fd7992ab591477ecd33fb616a981887bf54e Mon Sep 17 00:00:00 2001 From: Cong Lin Date: Tue, 10 Mar 2020 19:47:36 -0700 Subject: [PATCH] L3 oemcrypto: Replace NULL with nullptr Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206 Only one file is affected in Android repo. Bug: 149050172 Test: Unit tests Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c --- libwvdrmengine/oemcrypto/renewal/derive_key.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/renewal/derive_key.cpp b/libwvdrmengine/oemcrypto/renewal/derive_key.cpp index 8db2afaa..9cde5a92 100644 --- 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& key, const std::vector& context, std::vector* out) { - if (key.empty() || context.empty() || out == NULL) { + if (key.empty() || context.empty() || out == nullptr) { std::cerr << "DeriveKey(): Invalid inputs" << std::endl; return false; }