Protect against base_path being NULL. (#358405, many reporters)

2006-09-30  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilechooserbutton.c (update_combo_box): Protect
        against base_path being NULL.  (#358405, many reporters)

diff --git a/ChangeLog b/ChangeLog
index 6410756e94da838a1d7a276643d43f1044eefeac..ae61ee5bd146f2042cdf61efd40d91063db871ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (update_combo_box): Protect
+       against base_path being NULL.  (#358405, many reporters)
+
 2006-09-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemunix.c: Apply a patch by Padraig O'Briain

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 9c1d045547904956c0bf5b0c4a1b6ce70e8ba404..828106c6785482ddcaf9d41de4c9f576c20ad5b8 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2207,10 +2207,13 @@ update_combo_box (GtkFileChooserButton *button)
            GtkFilePath *base_path;
 
            base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
-           row_found = (paths &&
-                        paths->data &&
-                        gtk_file_path_compare (base_path, paths->data) == 0);
-           gtk_file_path_free (base_path);
+            if (base_path)
+              {
+               row_found = (paths &&
+                            paths->data &&
+                            gtk_file_path_compare (base_path, paths->data) == 0);
+               gtk_file_path_free (base_path);
+              }
          }
          break;
        default: