summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-private/nautilus-directory-async.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 16ea1de96..a09922f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-06 Alexander Larsson <alexl@redhat.com>
+
+ * libnautilus-private/nautilus-directory-async.c (directory_load_one):
+ Don't crash if info->name == NULL. (Not valid, but happened with
+ smb backend.)
+
2004-10-05 Martin Wehner <martin.wehner@epost.de>
* src/file-manager/fm-list-view.c (fm_list_view_set_selection):
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index bfed1fa8c..ab0a30c2a 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -962,7 +962,8 @@ static void
directory_load_one (NautilusDirectory *directory,
GnomeVFSFileInfo *info)
{
- if (info == NULL || is_dot_or_dot_dot (info->name)) {
+ if (info == NULL || info->name == NULL ||
+ is_dot_or_dot_dot (info->name)) {
return;
}