Fix some potential NULL pointer dereferences, and add support for finding

the process name by looking in /proc.  This is a bit of a hack in that it
requires /proc to be mounted.  Hopefully, though, if it's not, g-k-m and g-k
itself will no longer crash.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4143 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 19 insertions, 0 deletions

diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c
new file mode 100644
index 000000000..3df8081ba
--- /dev/null
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c
@@ -0,0 +1,19 @@
+--- src/gnome-keyring-manager-acl-display.c.orig	Sat Jul  2 02:12:49 2005
++++ src/gnome-keyring-manager-acl-display.c	Sat Jul  2 02:16:31 2005
+@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay *
+       GnomeKeyringAccessType at;
+       GtkTreeIter iter;
+       char *name, *path;
++      const char *app_path;
+ 
+       ac = (GnomeKeyringAccessControl*) tmp->data;
+       name = gnome_keyring_item_ac_get_display_name (ac);
+       path = gnome_keyring_item_ac_get_path_name (ac);
++      app_path = gkm_get_application_path ();
+ 
+       /* We don't want to include ourself in the list. */
+-      if (g_str_equal (path, gkm_get_application_path ()))
++      if (app_path && g_str_equal (path, app_path))
+ 	{
+ 	  self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
+ 	}