Index: webkit/media/webmediaplayer_impl.cc |
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc |
index 0b9cc7a770757fbf667efab82d1cdfb8467ea77f..030e57a28d67e93862132d12f0b9803d24b7084e 100644 |
--- a/webkit/media/webmediaplayer_impl.cc |
+++ b/webkit/media/webmediaplayer_impl.cc |
@@ -724,8 +724,12 @@ WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system, |
<< std::string(reinterpret_cast<const char*>(init_data), |
static_cast<size_t>(init_data_length)); |
- decryptor_.GenerateKeyRequest(key_system.utf8(), |
- init_data, init_data_length); |
+ if (!decryptor_.GenerateKeyRequest(key_system.utf8(), |
+ init_data, init_data_length)) { |
+ current_key_system_.reset(); |
+ return WebKit::WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported; |
+ } |
+ |
return WebKit::WebMediaPlayer::MediaKeyExceptionNoError; |
} |