diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 19:36:15 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 19:36:15 +0000 |
| commit | 5c311356f75f014502b63f1afa79c5452a0cfa59 (patch) | |
| tree | 8d366c605865ed25fecdff19f23418819e01e0a3 /chrome/browser/gtk/bookmark_utils_gtk.cc | |
| parent | 6eab9e655b841f03da3de2640e4d85e5d5be425a (diff) | |
| download | chromium_src-5c311356f75f014502b63f1afa79c5452a0cfa59.zip chromium_src-5c311356f75f014502b63f1afa79c5452a0cfa59.tar.gz chromium_src-5c311356f75f014502b63f1afa79c5452a0cfa59.tar.bz2 | |
gtk: Fix bookmark_utils::GetNodesFromSelection to not crash on invalid data.
BUG=43347
TEST=included
Review URL: http://codereview.chromium.org/2048002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_utils_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_utils_gtk.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc index 9c9c235..6dd47ac 100644 --- a/chrome/browser/gtk/bookmark_utils_gtk.cc +++ b/chrome/browser/gtk/bookmark_utils_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -360,7 +360,6 @@ void WriteBookmarksToSelection(const std::vector<const BookmarkNode*>& nodes, gtk_selection_data_set_text(selection_data, nodes[0]->GetURL().spec().c_str(), -1); break; - } default: { DLOG(ERROR) << "Unsupported drag get type!"; @@ -380,7 +379,7 @@ std::vector<const BookmarkNode*> GetNodesFromSelection( if (dnd_success) *dnd_success = FALSE; - if ((selection_data != NULL) && (selection_data->length >= 0)) { + if (selection_data && selection_data->length > 0) { if (context && delete_selection_data && context->action == GDK_ACTION_MOVE) *delete_selection_data = TRUE; |