Index: content/browser/service_worker/service_worker_version.cc |
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc |
index e8ae4a5e3c41c8083966b3eb5675c53819065a05..9c5f24c3b58c3db2a43673e4d22e12571b7f2b05 100644 |
--- a/content/browser/service_worker/service_worker_version.cc |
+++ b/content/browser/service_worker/service_worker_version.cc |
@@ -1337,7 +1337,8 @@ void ServiceWorkerVersion::OnPongFromWorker() { |
} |
void ServiceWorkerVersion::OnRegisterForeignFetchScopes( |
- const std::vector<GURL>& sub_scopes) { |
+ const std::vector<GURL>& sub_scopes, |
+ const std::vector<GURL>& origins) { |
DCHECK(status() == INSTALLING || status() == REDUNDANT) << status(); |
// Renderer should have already verified all these urls are inside the |
// worker's scope, but verify again here on the browser process side. |
@@ -1355,8 +1356,18 @@ void ServiceWorkerVersion::OnRegisterForeignFetchScopes( |
return; |
} |
} |
- foreign_fetch_scopes_.insert(foreign_fetch_scopes_.end(), sub_scopes.begin(), |
- sub_scopes.end()); |
+ for (const GURL& url : origins) { |
+ if (!url.is_valid()) { |
+ DVLOG(1) << "Received unexpected invalid URL from renderer process."; |
+ BrowserThread::PostTask( |
+ BrowserThread::UI, FROM_HERE, |
+ base::Bind(&KillEmbeddedWorkerProcess, embedded_worker_->process_id(), |
+ RESULT_CODE_KILLED_BAD_MESSAGE)); |
+ return; |
+ } |
+ } |
+ set_foreign_fetch_scopes(sub_scopes); |
+ set_foreign_fetch_origins(origins); |
} |
void ServiceWorkerVersion::DidEnsureLiveRegistrationForStartWorker( |