[tracker] libtracker-miner: Use g_file_equal instead of direct comparison



commit a69586e432a3b5925111a68b53312ce4b95a8b3a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Feb 25 15:33:32 2016 +0100

    libtracker-miner: Use g_file_equal instead of direct comparison
    
    We might be passed a non-canonical directory to
    file_notifier_current_root_check_remove_directory(), g_file_equal
    will be safer.

 src/libtracker-miner/tracker-file-notifier.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index 99bc56e..373c581 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -707,7 +707,8 @@ root_data_remove_directory (RootData *data,
                file = l->data;
                next = l->next;
 
-               if (file == directory || g_file_has_prefix (file, directory)) {
+               if (g_file_equal (file, directory) ||
+                   g_file_has_prefix (file, directory)) {
                        g_queue_remove (data->pending_dirs, file);
                        g_object_unref (file);
                }
@@ -715,7 +716,7 @@ root_data_remove_directory (RootData *data,
                l = next;
        }
 
-       return (data->current_dir == directory ||
+       return (g_file_equal (data->current_dir, directory) ||
                g_file_has_prefix (data->current_dir, directory));
 }
 


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