[gvfs/gnome-3-10] afp: Don't crash when opening the root directory



commit 20bb9205b25ab07864f3733205e420508b2102a6
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Thu Dec 19 15:53:24 2013 +0200

    afp: Don't crash when opening the root directory
    
    Previously, opening the root directory would generate an error and cause
    the backend to abort:
        backend_dbus_handler org.gtk.vfs.Mount:OpenForRead
        Queued new job 0xba4350 (GVfsJobOpenForRead)
    
        ** (process:6778): CRITICAL **: g_vfs_afp_volume_open_fork_finish:
        assertion 'g_simple_async_result_is_valid (res, G_OBJECT (volume),
        g_vfs_afp_volume_open_fork)' failed
    
        (process:6778): GLib-CRITICAL **: g_error_copy: assertion 'error !=
        NULL' failed
    
    Instead, remove the special-casing for the root directory since it is
    handled correctly anyway.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720743

 daemon/gvfsafpvolume.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
index 1ad8cd7..5b63ee0 100644
--- a/daemon/gvfsafpvolume.c
+++ b/daemon/gvfsafpvolume.c
@@ -460,14 +460,6 @@ g_vfs_afp_volume_open_fork (GVfsAfpVolume      *volume,
   g_return_if_fail (G_VFS_IS_AFP_VOLUME (volume));
 
   priv = volume->priv;
-  
-  if (is_root (filename))
-  {
-    g_simple_async_report_error_in_idle (G_OBJECT (volume), callback,
-                                         user_data, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
-                                         _("File is directory"));
-    return;
-  }
 
   comm = g_vfs_afp_command_new (AFP_COMMAND_OPEN_FORK);
   /* data fork */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]