summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:32:59 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:32:59 +0000
commitd5805b3d99d2d2b3774416cc754221a63a714ad2 (patch)
tree1a23f1d4d3d2902f394636f343e344c58a165bc9
parentcfc7d4491c21f67464aa7df706f7fe305c8e1dbc (diff)
downloadchromium_src-d5805b3d99d2d2b3774416cc754221a63a714ad2.zip
chromium_src-d5805b3d99d2d2b3774416cc754221a63a714ad2.tar.gz
chromium_src-d5805b3d99d2d2b3774416cc754221a63a714ad2.tar.bz2
Fixes possible crash in TopSitesBackend where it wasn't null checking
the db. BUG=61919 TEST=none Review URL: http://codereview.chromium.org/4446004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65120 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/top_sites_backend.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc
index e4f75ad..eb27a5e 100644
--- a/chrome/browser/history/top_sites_backend.cc
+++ b/chrome/browser/history/top_sites_backend.cc
@@ -102,14 +102,16 @@ void TopSitesBackend::GetMostVisitedThumbnailsOnDBThread(
if (request->canceled())
return;
+ bool may_need_history_migration = false;
if (db_.get()) {
db_->GetPageThumbnails(&(request->value->most_visited),
&(request->value->url_to_images_map));
+ may_need_history_migration = db_->may_need_history_migration();
}
request->ForwardResult(GetMostVisitedThumbnailsRequest::TupleType(
request->handle(),
request->value,
- db_->may_need_history_migration()));
+ may_need_history_migration));
}
void TopSitesBackend::UpdateTopSitesOnDBThread(const TopSitesDelta& delta) {