summaryrefslogtreecommitdiff
path: root/chromium
diff options
context:
space:
mode:
authorStaphany Park <staphany@chromium.org>2019-03-08 18:09:31 +0000
committerMichal Klocek <michal.klocek@qt.io>2019-07-22 10:01:41 +0000
commit9b92d3545a5a1a09da35da042ad47811d497efe0 (patch)
treee736b54e49d02414ad9f0c8d39b762723f185e91 /chromium
parentcafa7b65baa4a65dd523f40dc45d2e6702c8d7ee (diff)
downloadqtwebengine-chromium-9b92d3545a5a1a09da35da042ad47811d497efe0.tar.gz
[Backport] CVE-2019-5837 2/4
AppCache: Avoid recalculating cache size. Bug: 918293 Change-Id: Iee8e84acdd7b3ec897c1647aaa66ce020b99d211 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium')
-rw-r--r--chromium/content/browser/appcache/appcache.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/content/browser/appcache/appcache.cc b/chromium/content/browser/appcache/appcache.cc
index 3f52f7ff0dc..42878e6c05d 100644
--- a/chromium/content/browser/appcache/appcache.cc
+++ b/chromium/content/browser/appcache/appcache.cc
@@ -174,7 +174,7 @@ void AppCache::ToDatabaseRecords(
cache_record->group_id = group->group_id();
cache_record->online_wildcard = online_whitelist_all_;
cache_record->update_time = update_time_;
- cache_record->cache_size = 0;
+ cache_record->cache_size = cache_size_;
for (const auto& pair : entries_) {
entries->push_back(AppCacheDatabase::EntryRecord());
@@ -184,7 +184,6 @@ void AppCache::ToDatabaseRecords(
record.flags = pair.second.types();
record.response_id = pair.second.response_id();
record.response_size = pair.second.response_size();
- cache_record->cache_size += record.response_size;
}
const url::Origin origin = url::Origin::Create(group->manifest_url());