Check the size of ResourceRecords in ServiceWorkerDatabase::ReadRegistration()

content/browser/service_worker/service_worker_storage.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_storage.h"
 
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 521 matching lines @@
   data.scope = registration->pattern();
   data.script = version->script_url();
   data.has_fetch_handler = true;
   data.version_id = version->version_id();
   data.last_update_check = registration->last_update_check();
   data.is_active = (version == registration->active_version());
 
   ResourceList resources;
   version->script_cache_map()->GetResources(&resources);
 
+  if (resources.empty()) {

[michaeln, 2015/05/14 03:27:59]

thnx!

+    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;
   }
   data.resources_total_size_bytes = resources_total_size_bytes;
 
   if (!has_checked_for_stale_resources_)
     DeleteStaleResources();
 
   database_task_manager_->GetTaskRunner()->PostTask(
@@ skipping 535 matching lines @@
 
   ScheduleDeleteAndStartOver();
   callback.Run(DatabaseStatusToStatusCode(status),
                scoped_refptr<ServiceWorkerRegistration>());
 }
 
 void ServiceWorkerStorage::ReturnFoundRegistration(
     const FindRegistrationCallback& callback,
     const ServiceWorkerDatabase::RegistrationData& data,
     const ResourceList& resources) {
+  if (resources.empty()) {

[michaeln, 2015/05/14 03:27:59]

Is this code reachable with your changes to service_worker_database.cc? I think
all ReturnFoundRegistration callsites check the status code prior to coming in
here. If thats right, maybe just put a DCHECK here and trust the callers will
handle delete and start over.

[horo, 2015/05/14 03:46:50]

Ah, yes.
It should be DCHECK(!resources.empty());

+    ScheduleDeleteAndStartOver();
+    callback.Run(SERVICE_WORKER_ERROR_FAILED,
+                 scoped_refptr<ServiceWorkerRegistration>());
+    return;
+  }
   scoped_refptr<ServiceWorkerRegistration> registration =
       GetOrCreateRegistration(data, resources);
   CompleteFindNow(registration, SERVICE_WORKER_OK, callback);
 }
 
 void ServiceWorkerStorage::DidGetRegistrations(
     const GetRegistrationsInfosCallback& callback,
     RegistrationList* registrations,
     const GURL& origin_filter,
     ServiceWorkerDatabase::Status status) {
@@ skipping 700 matching lines @@
     callback.Run(SERVICE_WORKER_ERROR_FAILED);
     return;
   }
   DVLOG(1) << "Deleted ServiceWorkerDiskCache successfully.";
   ServiceWorkerMetrics::RecordDeleteAndStartOverResult(
       ServiceWorkerMetrics::DELETE_OK);
   callback.Run(SERVICE_WORKER_OK);
 }
 
 }  // namespace content