diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 23:49:37 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 23:49:37 +0000 |
| commit | 5e677b8257e3759a4f6363226055806d26f7601a (patch) | |
| tree | 859ae8fbfb0334ddfb76a6a558c3d1b66306f28b /chrome/browser/safe_browsing/safe_browsing_database.cc | |
| parent | 426dcd704580cc1e9e434d53553f52251704288a (diff) | |
| download | chromium_src-5e677b8257e3759a4f6363226055806d26f7601a.zip chromium_src-5e677b8257e3759a4f6363226055806d26f7601a.tar.gz chromium_src-5e677b8257e3759a4f6363226055806d26f7601a.tar.bz2 | |
Fix nested lock in safe_browsing_database.
Resetting the database (on corruption) caused a nested lock to be
acquired.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6674046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_database.cc')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 5b9d9a9..e432ede 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -409,8 +409,9 @@ bool SafeBrowsingDatabaseNew::ResetDatabase() { // TODO(shess): It is simpler for the code to assume that presence // of a bloom filter always implies presence of a prefix set. prefix_set_.reset(new safe_browsing::PrefixSet(std::vector<SBPrefix>())); - CsdWhitelistAllUrls(); } + // Wants to acquire the lock itself. + CsdWhitelistAllUrls(); return true; } |