Do not allow GTK File Chooser dialogs to return directories. This is probably...

chrome/browser/gtk/dialogs_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 <gtk/gtk.h>
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
-#include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/mime_util.h"
 #include "base/thread.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "grit/generated_resources.h"
 
@@ skipping 59 matching lines @@
   // |params_map_|.
   void* PopParamsForDialog(GtkWidget* dialog);
 
   // Removes and returns the parent associated with |dialog| from |parents_|.
   void RemoveParentForDialog(GtkWidget* dialog);
 
   // Check whether response_id corresponds to the user cancelling/closing the
   // dialog. Used as a helper for the below callbacks.
   static bool IsCancelResponse(gint response_id);
 
-  // Callback for when the user responds to a Save As or Open File or
-  // Select Folder dialog.
+  // Common function for OnSelectSingleFileDialogResponse and
+  // OnSelectSingleFolderDialogResponse.
+  static void SelectSingleFileHelper(GtkWidget* dialog,
+                                     gint response_id,
+                                     SelectFileDialogImpl* dialog_impl,
+                                     bool allow_folder);
+
+  // Callback for when the user responds to a Save As or Open File dialog.
   static void OnSelectSingleFileDialogResponse(
       GtkWidget* dialog, gint response_id, SelectFileDialogImpl* dialog_impl);
 
+  // Callback for when the user responds to a Select Folder dialog.
+  static void OnSelectSingleFolderDialogResponse(
+      GtkWidget* dialog, gint response_id, SelectFileDialogImpl* dialog_impl);
+
   // Callback for when the user responds to a Open Multiple Files dialog.
   static void OnSelectMultiFileDialogResponse(
       GtkWidget* dialog, gint response_id, SelectFileDialogImpl* dialog_impl);
 
   // Callback for when we update the preview for the selection.
   static void OnUpdatePreview(GtkFileChooser* chooser,
                               SelectFileDialogImpl* dialog);
 
   // The listener to be notified of selection completion.
   Listener* listener_;
@@ skipping 229 matching lines @@
 
   if (!default_path.empty()) {
     gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
                                   default_path.value().c_str());
   } else if (!last_opened_path_->empty()) {
     gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
                                         last_opened_path_->value().c_str());
   }
   gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
   g_signal_connect(G_OBJECT(dialog), "response",
-                   G_CALLBACK(OnSelectSingleFileDialogResponse), this);
+                   G_CALLBACK(OnSelectSingleFolderDialogResponse), this);
   return dialog;
 }
 
 GtkWidget* SelectFileDialogImpl::CreateFileOpenDialog(const std::string& title,
     const FilePath& default_path, gfx::NativeWindow parent) {
   std::string title_string = !title.empty() ? title :
         l10n_util::GetStringUTF8(IDS_OPEN_FILE_DIALOG_TITLE);
 
   GtkWidget* dialog =
       gtk_file_chooser_dialog_new(title_string.c_str(), parent,
@@ skipping 102 matching lines @@
   bool is_cancel = response_id == GTK_RESPONSE_CANCEL ||
                    response_id == GTK_RESPONSE_DELETE_EVENT;
   if (is_cancel)
     return true;
 
   DCHECK(response_id == GTK_RESPONSE_ACCEPT);
   return false;
 }
 
 // static
+void SelectFileDialogImpl::SelectSingleFileHelper(GtkWidget* dialog,
+    gint response_id,
+    SelectFileDialogImpl* dialog_impl,
+    bool allow_folder) {
+  if (IsCancelResponse(response_id)) {
+    dialog_impl->FileNotSelected(dialog);
+    return;
+  }
+
+  gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+  if (!filename) {
+    dialog_impl->FileNotSelected(dialog);
+    return;
+  }
+
+  FilePath path(filename);
+  g_free(filename);
+
+  if (allow_folder) {
+    dialog_impl->FileSelected(dialog, path);
+    return;
+  }
+
+  // We're accessing the disk from the UI thread here, but in this case it's
+  // ok because we may have just done lots of stats in the file selection
+  // dialog. One more won't hurt too badly.
+  if (file_util::DirectoryExists(path))
+    dialog_impl->FileNotSelected(dialog);
+  else
+    dialog_impl->FileSelected(dialog, path);
+}
+
+// static
 void SelectFileDialogImpl::OnSelectSingleFileDialogResponse(
     GtkWidget* dialog, gint response_id,
     SelectFileDialogImpl* dialog_impl) {
-  gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+  return SelectSingleFileHelper(dialog, response_id, dialog_impl, false);
+}
 
-  if (!filename || IsCancelResponse(response_id)) {
-    dialog_impl->FileNotSelected(dialog);
-    return;
-  }
-
-  FilePath path(filename);
-  g_free(filename);
-  dialog_impl->FileSelected(dialog, path);
+// static
+void SelectFileDialogImpl::OnSelectSingleFolderDialogResponse(
+    GtkWidget* dialog, gint response_id,
+    SelectFileDialogImpl* dialog_impl) {
+  return SelectSingleFileHelper(dialog, response_id, dialog_impl, true);
 }
 
 // static
 void SelectFileDialogImpl::OnSelectMultiFileDialogResponse(
     GtkWidget* dialog, gint response_id,
     SelectFileDialogImpl* dialog_impl) {
+  if (IsCancelResponse(response_id)) {
+    dialog_impl->FileNotSelected(dialog);
+    return;
+  }
+
   GSList* filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
-
-  if (!filenames || IsCancelResponse(response_id)) {
+  if (!filenames) {
     dialog_impl->FileNotSelected(dialog);
     return;
   }
 
   std::vector<FilePath> filenames_fp;
   for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) {
-    filenames_fp.push_back(FilePath(static_cast<char*>(iter->data)));
+    FilePath path(static_cast<char*>(iter->data));
     g_free(iter->data);
+    if (file_util::DirectoryExists(path))
+      continue;
+    filenames_fp.push_back(path);
   }
+  g_slist_free(filenames);
 
-  g_slist_free(filenames);
+  if (filenames_fp.empty()) {
+    dialog_impl->FileNotSelected(dialog);
+    return;
+  }
   dialog_impl->MultiFilesSelected(dialog, filenames_fp);
 }
 
 // static
 void SelectFileDialogImpl::OnUpdatePreview(GtkFileChooser* chooser,
                                            SelectFileDialogImpl* dialog) {
   gchar* filename = gtk_file_chooser_get_preview_filename(chooser);
   if (!filename)
     return;
   // This will preserve the image's aspect ratio.
   GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_size(filename, kPreviewWidth,
                                                        kPreviewHeight, NULL);
   g_free(filename);
   if (pixbuf) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->preview_), pixbuf);
     g_object_unref(pixbuf);
   }
   gtk_file_chooser_set_preview_widget_active(chooser, pixbuf ? TRUE : FALSE);
 }