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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 328037: Fix browser crash on startup. (Closed)
Patch Set: Created 11 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 60c1cd4de714d39683cd83f32109ff62eb391a81..daab3c77ff0b9001b6674c8ef38775425c4e4875 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -648,7 +648,7 @@ void BookmarkModel::OnFavIconDataAvailable(
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
DCHECK(node);
node->set_favicon_load_handle(0);
- if (know_favicon && data.get() &&
+ if (know_favicon && data.get() && data->size() &&
sky 2009/10/27 16:07:03 nit: !data->data.empty()
gfx::PNGCodec::Decode(data->front(), data->size(), &fav_icon)) {
node->set_favicon(fav_icon);
FavIconLoaded(node);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698