Source/core/dom/Document.cpp - Issue 1171363002: Fix null pointer dereference in ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate.

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: Source/core/dom/Document.cpp

Issue 1171363002: Fix null pointer dereference in ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 6 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/dom/Document.cpp

diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp

index 5de448e994c44c58bd1dff385ebd6ee67c227640..87fc15b0ef48cfbdea3eaa2877db4daf8ee249a7 100644

--- a/Source/core/dom/Document.cpp

+++ b/Source/core/dom/Document.cpp

@@ -2556,7 +2556,7 @@ bool Document::dispatchBeforeUnloadEvent(ChromeClient& chromeClient, bool& didAl

m_loadEventProgress = BeforeUnloadEventCompleted;

if (!beforeUnloadEvent->defaultPrevented())

defaultEventHandler(beforeUnloadEvent.get());

- if (beforeUnloadEvent->returnValue().isNull())

+ if (!frame() || beforeUnloadEvent->returnValue().isNull())

return true;

if (didAllowNavigation) {

« no previous file with comments | « LayoutTests/fast/events/before-unload-crash-expected.txt ('k') | Source/core/page/ChromeClient.cpp » ('j') | no next file with comments »