Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainer.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:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index 558f2cd74ea9f6c3f1933d378141bf0b04c0bd5a..cd58f06fe3adf70718e9dde2ea476913945b5891 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -70,6 +70,11 @@ ScriptPromise ServiceWorkerContainer::registerServiceWorker(ExecutionContext* ex
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
ScriptPromise promise = resolver->promise();
+ if (!m_provider) {
+ resolver->reject(DOMError::create(InvalidStateError, "No associated provider is available"));
+ return promise;
+ }
+
RefPtr<SecurityOrigin> documentOrigin = executionContext->securityOrigin();
KURL patternURL = executionContext->completeURL(options.scope);
if (!documentOrigin->canRequest(patternURL)) {
@@ -93,11 +98,15 @@ ScriptPromise ServiceWorkerContainer::unregisterServiceWorker(ExecutionContext*
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
ScriptPromise promise = resolver->promise();
+ if (!m_provider) {
+ resolver->reject(DOMError::create(InvalidStateError, "No associated provider is available"));
+ return promise;
+ }
+
RefPtr<SecurityOrigin> documentOrigin = executionContext->securityOrigin();
KURL patternURL = executionContext->completeURL(pattern);
if (!pattern.isEmpty() && !documentOrigin->canRequest(patternURL)) {
resolver->reject(DOMError::create(SecurityError, "Can only unregister for patterns in the document's origin."));
-
return promise;
}
@@ -106,10 +115,15 @@ ScriptPromise ServiceWorkerContainer::unregisterServiceWorker(ExecutionContext*
}
ServiceWorkerContainer::ServiceWorkerContainer(ExecutionContext* executionContext)
- : m_provider(ServiceWorkerContainerClient::from(executionContext)->provider())
+ : m_provider(0)
{
ScriptWrappable::init(this);
- m_provider->setClient(this);
+
+ if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
+ m_provider = client->provider();
+ if (m_provider)
+ m_provider->setClient(this);
+ }
}
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698