immediately bail out if current_folder is NULL. (#350988, lots of

2007-03-12  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkfilechooserdefault.c (check_save_entry): immediately
	bail out if current_folder is NULL. (#350988, lots of reporters,
	modified patch by Jan Darmochwal).

svn path=/trunk/; revision=17479

diff --git a/ChangeLog b/ChangeLog
index f20b2e70bfd54eb18907d73fb2a766405eb95718..a747a088c2759a7dac442cc5b0429f72c5e194a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-12  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkfilechooserdefault.c (check_save_entry): immediately
+       bail out if current_folder is NULL. (#350988, lots of reporters,
+       modified patch by Jan Darmochwal).
+
 2007-03-10  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): only

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b6fabd6a65f6500538f9035fa1e953413ca78125..27f45241e9130353d89fd76c1e3f5b962cb997d1 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6630,6 +6630,16 @@ check_save_entry (GtkFileChooserDefault *impl,
   *is_empty_ret = FALSE;
 
   current_folder = _gtk_file_chooser_entry_get_current_folder (chooser_entry);
+  if (!current_folder)
+    {
+      *path_ret = NULL;
+      *is_well_formed_ret = FALSE;
+      *is_file_part_empty_ret = FALSE;
+      *is_folder = FALSE;
+
+      return;
+    }
+
   file_part = _gtk_file_chooser_entry_get_file_part (chooser_entry);
 
   if (!file_part || file_part[0] == '\0')