ash/accelerators/accelerator_dispatcher_linux.cc - Issue 9348113: Fix two crash and potential leak&crash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/accelerators/accelerator_dispatcher_linux.cc

Issue 9348113: Fix two crash and potential leak&crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/accelerators/accelerator_dispatcher_linux.cc

diff --git a/ash/accelerators/accelerator_dispatcher_linux.cc b/ash/accelerators/accelerator_dispatcher_linux.cc

index 91fa80c57212b5bb4cc79c16a5f2eeb8ec48f06b..76a57672a9dd76ac30c2922209e9ff5c5bf38d2a 100644

--- a/ash/accelerators/accelerator_dispatcher_linux.cc

+++ b/ash/accelerators/accelerator_dispatcher_linux.cc

@@ -28,6 +28,8 @@ const int kModifierMask = (ui::EF_SHIFT_DOWN |

base::MessagePumpDispatcher::DispatchStatus AcceleratorDispatcher::Dispatch(

XEvent* xev) {

+ if (!associated_window_)

+ return EVENT_QUIT;

if (!associated_window_->CanReceiveEvents())

return aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev);