content/browser/service_worker/service_worker_storage.cc - Issue 1135743002: Check the size of ResourceRecords in ServiceWorkerDatabase::ReadRegistration()

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: content/browser/service_worker/service_worker_storage.cc

Issue 1135743002: Check the size of ResourceRecords in ServiceWorkerDatabase::ReadRegistration() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: DCHECK in ServiceWorkerStorage::ReturnFoundRegistration() Created 5 years, 7 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

« no previous file with comments | « content/browser/service_worker/service_worker_handle_unittest.cc ('k') | content/browser/service_worker/service_worker_storage_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_storage.cc

diff --git a/content/browser/service_worker/service_worker_storage.cc b/content/browser/service_worker/service_worker_storage.cc

index c8a11c39fb3e805332083e5430795a8724fa698e..540a2e373aba76ca727be839097590252e3257b3 100644

--- a/content/browser/service_worker/service_worker_storage.cc

+++ b/content/browser/service_worker/service_worker_storage.cc

@@ -539,6 +539,11 @@ void ServiceWorkerStorage::StoreRegistration(

ResourceList resources;

version->script_cache_map()->GetResources(&resources);

+ if (resources.empty()) {

+ RunSoon(FROM_HERE, base::Bind(callback, SERVICE_WORKER_ERROR_FAILED));

+ return;

+ }

uint64 resources_total_size_bytes = 0;

for (const auto& resource : resources) {

resources_total_size_bytes += resource.size_bytes;

@@ -1094,6 +1099,7 @@ void ServiceWorkerStorage::ReturnFoundRegistration(

const FindRegistrationCallback& callback,

const ServiceWorkerDatabase::RegistrationData& data,

const ResourceList& resources) {

+ DCHECK(!resources.empty());

scoped_refptr<ServiceWorkerRegistration> registration =

GetOrCreateRegistration(data, resources);

CompleteFindNow(registration, SERVICE_WORKER_OK, callback);