Encrypted Media: Allows empty key message to be fired.

media/crypto/aes_decryptor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/crypto/aes_decryptor.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 121 matching lines @@
 AesDecryptor::~AesDecryptor() {
   STLDeleteValues(&key_map_);
 }
 
 bool AesDecryptor::GenerateKeyRequest(const std::string& key_system,
                                       const std::string& type,
                                       const uint8* init_data,
                                       int init_data_length) {
   std::string session_id_string(base::UintToString(next_session_id_++));
 
-  if (!init_data || !init_data_length) {
-    DVLOG(1) << "init_data required to generate a key request.";
-    return false;
-  }
-
   // For now, the AesDecryptor does not care about |key_system| and |type|;
   // just fire the event with the |init_data| as the request.
-  int message_length = init_data_length;
-  scoped_array<uint8> message(new uint8[message_length]);
-  memcpy(message.get(), init_data, message_length);
+  scoped_array<uint8> message;
+  int message_length = 0;
+
+  if (init_data && init_data_length) {
+    message_length = init_data_length;
+    message.reset(new uint8[message_length]);
+    memcpy(message.get(), init_data, message_length);
+  }
 
   client_->KeyMessage(key_system, session_id_string,
                       message.Pass(), message_length, "");
   return true;
 }
 
 void AesDecryptor::AddKey(const std::string& key_system,
                           const uint8* key,
                           int key_length,
                           const uint8* init_data,
@@ skipping 165 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_.get())
     return false;
   return true;
 }
 
 }  // namespace media