gtk+ r19544 - in branches/gtk-2-12: . gtk

[bratsche svn gnome org]

Author: bratsche
Date: Tue Feb 12 21:05:32 2008
New Revision: 19544
URL: http://svn.gnome.org/viewvc/gtk+?rev=19544&view=rev

Log:
2008-02-10  Cody Russell  <bratsche gnome org>

	Merged from trunk:

        * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder_uri):
        Check the return value of _gtk_file_chooser_get_file_system () for
        NULL before passing it to gtk_file_system_path_to_uri ().
        (#515667, Francesco Montorsi)



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkfilechooser.c

Modified: branches/gtk-2-12/gtk/gtkfilechooser.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkfilechooser.c	(original)
+++ branches/gtk-2-12/gtk/gtkfilechooser.c	Tue Feb 12 21:05:32 2008
@@ -1049,6 +1049,9 @@
   file_system = _gtk_file_chooser_get_file_system (chooser);
 
   path = _gtk_file_chooser_get_current_folder_path (chooser);
+  if (!path)
+    return NULL;
+
   uri = gtk_file_system_path_to_uri (file_system, path);
   gtk_file_path_free (path);