[Xfce4-commits] [xfce/xfce4-panel] 33/73: Do not descend to directories that are symlinks.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andrzejr pushed a commit to branch master
in repository xfce/xfce4-panel.

commit e451a4b58fdcef6e34a67b12094b3d6fd561d729
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Jan 25 02:19:26 2015 +0000

    Do not descend to directories that are symlinks.
    
    This avoids possibility of infinite loops during recursion.
    The assumption is that all directories are still in /usr/share/zoneinfo,
    that is, none of the symlinks point outside of it.
---
 plugins/clock/clock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 3900a48..89ba45c 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -908,7 +908,8 @@ clock_plugin_configure_zoneinfo_model_insert (GtkListStore *store,
 
       if (g_file_test (filename, G_FILE_TEST_IS_DIR))
         {
-          clock_plugin_configure_zoneinfo_model_insert (store, filename);
+          if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))
+            clock_plugin_configure_zoneinfo_model_insert (store, filename);
         }
       else
         {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.