Source/modules/serviceworkers/NavigatorServiceWorker.cpp - Issue 217023003: Add null checks in navigator.serviceWorker access to fix possible 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: Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Issue 217023003: Add null checks in navigator.serviceWorker access to fix possible crash (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: reverted iframe change Created 6 years, 9 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: Source/modules/serviceworkers/NavigatorServiceWorker.cpp

diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

index a5ddd516e1786a29a08224fc25ff6f7d1167df86..d4068538cffcd18730fd68b633c2fb63d149d7a9 100644

--- a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

@@ -53,8 +53,10 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext*

void NavigatorServiceWorker::willDetachGlobalObjectFromFrame()

{

- m_serviceWorker->detachClient();

- m_serviceWorker = nullptr;

+ if (m_serviceWorker) {

+ m_serviceWorker->detachClient();

+ m_serviceWorker = nullptr;

+ }

}

} // namespace WebCore