Add a check for NULL in PopulateFolderCombo.

chrome/browser/gtk/bookmark_bubble_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
@@ skipping 18 matching lines @@
 // We basically have a singleton, since a bubble is sort of app-modal.  This
 // keeps track of the currently open bubble, or NULL if none is open.
 BookmarkBubbleGtk* g_bubble = NULL;
 
 // Max number of most recently used folders.
 const size_t kMaxMRUFolders = 5;
 
 std::vector<const BookmarkNode*> PopulateFolderCombo(BookmarkModel* model,
                                                      const GURL& url,
                                                      GtkWidget* folder_combo) {
-  const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url);
-  const BookmarkNode* parent = node->GetParent();
   const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
   const BookmarkNode* other = model->other_node();
+  const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url);
+  const BookmarkNode* parent = node ? node->GetParent() : NULL;
 
   // Use + 2 to account for bookmark bar and other node.
   std::vector<const BookmarkNode*> recent_nodes =
       bookmark_utils::GetMostRecentlyModifiedGroups(model, kMaxMRUFolders + 2);
 
   std::vector<const BookmarkNode*> nodes;
   // Make the parent the first item, unless it's the bookmark bar or other node.
-  if (parent != bookmark_bar && parent != other)
+  if (parent && parent != bookmark_bar && parent != other)
     nodes.push_back(parent);
 
   for (size_t i = 0; i < recent_nodes.size(); ++i) {
     if (recent_nodes[i] != parent &&
         recent_nodes[i] != bookmark_bar &&
         recent_nodes[i] != other) {
       nodes.push_back(recent_nodes[i]);
     }
     // Make sure we only have kMaxMRUFolders in the first chunk.
     if (nodes.size() == kMaxMRUFolders)
       break;
   }
 
   // And put the bookmark bar and other nodes at the end of the list.
   nodes.push_back(bookmark_bar);
   nodes.push_back(other);
 
   // We always have nodes + 1 entries in the combo.  The last entry will be
   // the 'Select another folder...' entry that opens the bookmark editor.
   for (size_t i = 0; i < nodes.size(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo),
                               WideToUTF8(nodes[i]->GetTitle()).c_str());
   }
   gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo),
       l10n_util::GetStringUTF8(
           IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER).c_str());
 
-  int parent_index = static_cast<int>(
-      std::find(nodes.begin(), nodes.end(), parent) - nodes.begin());
+  gint parent_index = 0;
+  if (parent) {
+    parent_index = static_cast<gint>(
+        std::find(nodes.begin(), nodes.end(), parent) - nodes.begin());
+  }
   gtk_combo_box_set_active(GTK_COMBO_BOX(folder_combo), parent_index);
 
   return nodes;
 }
 
 }  // namespace
 
 // static
 void BookmarkBubbleGtk::Show(GtkWindow* toplevel_window,
                              const gfx::Rect& rect,
@@ skipping 277 matching lines @@
 
   // Close the bubble, deleting the C++ objects, etc.
   bubble_->Close();
 
   if (node) {
     BookmarkEditor::Show(toplevel, profile, NULL,
                          BookmarkEditor::EditDetails(node),
                          BookmarkEditor::SHOW_TREE, NULL);
   }
 }