patches/gnome-menus-05-lost-menu.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 16789 c4c500cc6a95
child 21412 7576117545d7
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446

--- gnome-menus-2.28.0.1.old/libmenu/entry-directories.c	2008-04-21 20:49:29.000000000 +0100
+++ gnome-menus-2.28.0.1/libmenu/entry-directories.c	2008-05-29 13:33:17.427979000 +0100
@@ -401,8 +400,13 @@ handle_cached_dir_changed (MenuMonitor  
                 event == MENU_MONITOR_EVENT_CREATED ? ("created") :
                 event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
 
-  dirname  = g_path_get_dirname  (path);
-  basename = g_path_get_basename (path);
+  if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
+    dirname = g_strdup (path);
+    basename = NULL;
+  } else {
+    dirname  = g_path_get_dirname  (path);
+    basename = g_path_get_basename (path);
+  }
 
   dir = cached_dir_lookup (dirname);