Author: benny
Date: 2006-09-14 13:27:54 +0000 (Thu, 14 Sep 2006)
New Revision: 23158

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar-vfs/thunar-vfs-io-local.c
Log:
2006-09-14      Benedikt Meurer <[EMAIL PROTECTED]>

        * thunar-vfs/thunar-vfs-io-local.c(_thunar_vfs_io_local_get_info):
          Properly validate the Name of .desktop files. Bug #2227.




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog      2006-09-14 12:57:22 UTC (rev 23157)
+++ thunar/trunk/ChangeLog      2006-09-14 13:27:54 UTC (rev 23158)
@@ -1,5 +1,10 @@
 2006-09-14     Benedikt Meurer <[EMAIL PROTECTED]>
 
+       * thunar-vfs/thunar-vfs-io-local.c(_thunar_vfs_io_local_get_info):
+         Properly validate the Name of .desktop files. Bug #2227.
+
+2006-09-14     Benedikt Meurer <[EMAIL PROTECTED]>
+
        * thunarx/thunarx-config.h.in, thunarx/thunarx-file-info.h: Fix build
          with GLib 2.6.x. Bug #2317.
 

Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-local.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-io-local.c       2006-09-14 12:57:22 UTC 
(rev 23157)
+++ thunar/trunk/thunar-vfs/thunar-vfs-io-local.c       2006-09-14 13:27:54 UTC 
(rev 23158)
@@ -382,7 +382,7 @@
 
               /* check if we have a valid name info */
               name = xfce_rc_read_entry (rc, "Name", NULL);
-              if (G_LIKELY (name != NULL && *name != '\0' && g_utf8_validate 
(name, -1, NULL)))
+              if (G_LIKELY (name != NULL && *name != '\0' && g_utf8_validate 
(name, -1, NULL) && strchr (name, G_DIR_SEPARATOR) == NULL))
                 {
                   /* check if we declared the file as executable */
                   if ((info->flags & THUNAR_VFS_FILE_FLAGS_EXECUTABLE) != 0)

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to