summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/top_sites_database.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:32:20 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:32:20 +0000
commitcfc7d4491c21f67464aa7df706f7fe305c8e1dbc (patch)
tree2a6750bea46103971933b84984e8b68b1ea34f64 /chrome/browser/history/top_sites_database.cc
parent9ee9cd8145136bfa422c1213eaeecb4882581698 (diff)
downloadchromium_src-cfc7d4491c21f67464aa7df706f7fe305c8e1dbc.zip
chromium_src-cfc7d4491c21f67464aa7df706f7fe305c8e1dbc.tar.gz
chromium_src-cfc7d4491c21f67464aa7df706f7fe305c8e1dbc.tar.bz2
Fixes bug in TopSitesDB where it could end up crashing if thumbnail
was empty. BUG=61917 TEST=none Review URL: http://codereview.chromium.org/4410004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/top_sites_database.cc')
-rw-r--r--chrome/browser/history/top_sites_database.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/history/top_sites_database.cc b/chrome/browser/history/top_sites_database.cc
index 1058d22..8bfbcaf 100644
--- a/chrome/browser/history/top_sites_database.cc
+++ b/chrome/browser/history/top_sites_database.cc
@@ -168,9 +168,9 @@ void TopSitesDatabase::UpdatePageThumbnail(
return;
statement.BindString16(0, url.title);
- if (thumbnail.thumbnail.get()) {
- statement.BindBlob(1, &thumbnail.thumbnail->data.front(),
- static_cast<int>(thumbnail.thumbnail->data.size()));
+ if (thumbnail.thumbnail.get() && thumbnail.thumbnail->front()) {
+ statement.BindBlob(1, thumbnail.thumbnail->front(),
+ static_cast<int>(thumbnail.thumbnail->size()));
}
statement.BindString(2, GetRedirects(url));
const ThumbnailScore& score = thumbnail.thumbnail_score;
@@ -200,9 +200,9 @@ void TopSitesDatabase::AddPageThumbnail(const MostVisitedURL& url,
statement.BindString(0, url.url.spec());
statement.BindInt(1, count); // Make it the last url.
statement.BindString16(2, url.title);
- if (thumbnail.thumbnail.get()) {
- statement.BindBlob(3, &thumbnail.thumbnail->data.front(),
- static_cast<int>(thumbnail.thumbnail->data.size()));
+ if (thumbnail.thumbnail.get() && thumbnail.thumbnail->front()) {
+ statement.BindBlob(3, thumbnail.thumbnail->front(),
+ static_cast<int>(thumbnail.thumbnail->size()));
}
statement.BindString(4, GetRedirects(url));
const ThumbnailScore& score = thumbnail.thumbnail_score;