From 97e0d1120f3ac52fe5a271ffb75b2eb81632a3f6 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 11 Feb 2008 01:51:14 +0000 Subject: [PATCH] Check the return value of _gtk_file_chooser_get_file_system () for NULL 2008-02-10 Cody Russell * 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) svn path=/trunk/; revision=19508 --- ChangeLog | 7 +++++++ gtk/gtkfilechooser.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5c253dc12..abe907a0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-10 Cody Russell + + * 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) + 2008-02-10 Philip Withnall * gtk/gtkbuilder.c: Improve the documentation for diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index dbaeba006..e5e225b93 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -1049,6 +1049,9 @@ gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser) 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); -- 2.43.2