Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_database.cc

Issue 1807253002: Properly handle the Module SBDatabase when it's corrupted (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add to histograms.xml Created 4 years, 9 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 | « chrome/browser/safe_browsing/safe_browsing_database.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_database.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc
index 74ae7bbd1a218f425e402310b3fa46ac90a7fca1..3ec1f1180a46ac502e7190285f8c9f5f6322c9f6 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -841,6 +841,7 @@ bool SafeBrowsingDatabaseNew::ResetDatabase() {
txn->clear_ip_blacklist();
txn->WhitelistEverything(SBWhitelistId::CSD);
txn->WhitelistEverything(SBWhitelistId::DOWNLOAD);
+ txn->WhitelistEverything(SBWhitelistId::MODULE);
return true;
}
@@ -1730,7 +1731,13 @@ bool SafeBrowsingDatabaseNew::Delete() {
if (!r11)
RecordFailure(FAILURE_RESOURCE_BLACKLIST_DELETE);
- return r1 && r2 && r3 && r4 && r5 && r6 && r7 && r8 && r9 && r10 && r11;
+ const bool r12 =
+ module_whitelist_store_.get() ? module_whitelist_store_->Delete() : true;
+ if (!r12)
+ RecordFailure(FAILURE_MODULE_WHITELIST_DELETE);
+
+ return r1 && r2 && r3 && r4 && r5 && r6 && r7 && r8 && r9 && r10 && r11 &&
+ r12;
}
void SafeBrowsingDatabaseNew::WritePrefixSet(const base::FilePath& db_filename,
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_database.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698