summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsudarsana.nagineni@intel.com <sudarsana.nagineni@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 23:37:40 +0000
committersudarsana.nagineni@intel.com <sudarsana.nagineni@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 23:37:40 +0000
commit43444d032f7d3eca247149866cde3b811c8c3c06 (patch)
tree3242cac09795ed10e78b7dcaeded5f8bcd1c0dd1 /ui
parentcde1bd0298ec9a9d9d720362405024ee911122f5 (diff)
downloadchromium_src-43444d032f7d3eca247149866cde3b811c8c3c06.zip
chromium_src-43444d032f7d3eca247149866cde3b811c8c3c06.tar.gz
chromium_src-43444d032f7d3eca247149866cde3b811c8c3c06.tar.bz2
Fix a crash in X11WindowEventFilter::OnMouseEvent() by adding NULL check on Window::delegate().
BUG=337460 Review URL: https://codereview.chromium.org/140593003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/widget/desktop_aura/x11_window_event_filter.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
index 2c490f3..45418fb 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
@@ -98,6 +98,9 @@ void X11WindowEventFilter::OnMouseEvent(ui::MouseEvent* event) {
return;
aura::Window* target = static_cast<aura::Window*>(event->target());
+ if (!target->delegate())
+ return;
+
int component =
target->delegate()->GetNonClientComponent(event->location());
if (component == HTCLIENT)