summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorharaken <haraken@chromium.org>2016-09-21 04:45:21 (GMT)
committerCommit bot <commit-bot@chromium.org>2016-09-21 04:47:59 (GMT)
commit7f747dc36f42f789a92e122cf0f7d1e5d6eeaee0 (patch)
tree31ac1ba19a00c9b0b20c689f87d10084d7513d3f
parent2c5c70912ccd80e712b18b4bf39f6da3d41e8847 (diff)
downloadchromium-7f747dc36f42f789a92e122cf0f7d1e5d6eeaee0.tar.gz
chromium-7f747dc36f42f789a92e122cf0f7d1e5d6eeaee0.tar.xz
Add a missing null check for MIDIAccess::getExecutionContext()
This is a fix after r419951 BUG=610176 TBR=dcheng@chromium.org NOTRY=true Review-Url: https://codereview.chromium.org/2357833002 Cr-Commit-Position: refs/heads/master@{#419974}
-rw-r--r--third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
index 6820e49..42fbfd8 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
@@ -88,7 +88,7 @@ void MIDIAccess::setOnstatechange(EventListener* listener)
bool MIDIAccess::hasPendingActivity() const
{
- return m_hasPendingActivity && !getExecutionContext()->activeDOMObjectsAreStopped();
+ return m_hasPendingActivity && getExecutionContext() && !getExecutionContext()->activeDOMObjectsAreStopped();
}
MIDIInputMap* MIDIAccess::inputs() const