summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 07:49:36 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 07:49:36 +0000
commit33325ff07893ff075f107ca4a5210faa5d934bd9 (patch)
treef9d39703092200221a2a63ab3a76d33f09a5e677 /webkit
parentc9028d86aa89f117911f9d08ad2456b91c942490 (diff)
downloadchromium_src-33325ff07893ff075f107ca4a5210faa5d934bd9.zip
chromium_src-33325ff07893ff075f107ca4a5210faa5d934bd9.tar.gz
chromium_src-33325ff07893ff075f107ca4a5210faa5d934bd9.tar.bz2
Check if a key message is empty before accessing &message[0].
TBR=ddorwin@chromium.org BUG=255971 TEST=Tested on Windows 7. Review URL: https://chromiumcodereview.appspot.com/18295002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/renderer/media/webmediaplayer_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc
index 09470a2..08fa5da 100644
--- a/webkit/renderer/media/webmediaplayer_impl.cc
+++ b/webkit/renderer/media/webmediaplayer_impl.cc
@@ -976,7 +976,7 @@ void WebMediaPlayerImpl::OnKeyMessage(const std::string& session_id,
GetClient()->keyMessage(current_key_system_,
WebString::fromUTF8(session_id),
- &message[0],
+ message.empty() ? NULL : &message[0],
message.size(),
default_url_gurl);
}