content/browser/service_worker/service_worker_database.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_database.cc

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

Patch Set: Added check logic in ServiceWorkerStorage and updated tests. 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

« content/browser/service_worker/embedded_worker_test_helper.cc ('K') | « content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc ('k') | content/browser/service_worker/service_worker_database_unittest.cc » ('j') | content/browser/service_worker/service_worker_storage.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_database.cc

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

index fca967cf830e8081ddeb5d20e2f2bab5de766379..c928c38751c4929848b1bd301720fecd0df2f986 100644

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

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

@@ -538,6 +538,10 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(

if (status != STATUS_OK)

return status;

+ // ResourceRecord must contain the ServiceWorker's main script.

+ if (resources->empty())

+ return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;

*registration = value;

return STATUS_OK;

}

@@ -583,6 +587,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(

std::vector<int64>* newly_purgeable_resources) {

DCHECK(sequence_checker_.CalledOnValidSequencedThread());

DCHECK(old_registration);

+ DCHECK(!resources.empty());

Status status = LazyOpen(true);

old_registration->version_id = kInvalidServiceWorkerVersionId;

if (status != STATUS_OK)