Source release 19.1.0

cdm/src/cdm.cpp

@@ -1499,7 +1499,9 @@ Cdm::Status CdmImpl::ConvertStatusCode(
     case PRIVACY_MODE_ERROR_3:
       LOGE("No service certificate installed; %s", message.c_str());
       return kNeedsServiceCertificate;
-
+    case DEVICE_REVOKED:
+      LOGE("Device has been revoked; %s", message.c_str());
+      return kDeviceRevoked;
     default:
       LOGE("Unknown error; %s", message.c_str());
       return kUnexpectedError;

cdm/src/log.cpp

@@ -40,8 +40,8 @@ void Log(const char* file, const char* function, int line, LogPriority level,
   }
 
   const char* severities[] = {"ERROR", "WARN", "INFO", "DEBUG", "VERBOSE"};
-  if (level >=
-      static_cast<LogPriority>(sizeof(severities) / sizeof(*severities))) {
+  if (level < 0 || level >= static_cast<LogPriority>(sizeof(severities) /
+                                                     sizeof(severities[0]))) {
     std::string fatal_message(kFallbackLogMessage);
     FormatString(&fatal_message,
                  "[FATAL:%s(%d):%s] Invalid log priority level: %d", file, line,

cdm/src/properties_ce.cpp

@@ -278,4 +278,7 @@ bool Properties::AlwaysUseKeySetIds() { return true; }
 // static
 bool Properties::UseProviderIdInProvisioningRequest() { return true; }
 
+// static
+bool Properties::ForceL3() { return false; }
+
 }  // namespace wvcdm