summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@linuxfr.org>2007-02-12 21:02:01 +0000
committerPascal Terjan <pterjan@src.gnome.org>2007-02-12 21:02:01 +0000
commit16d41df3ad48b8d512afaf04937f19c9bdf0eafa (patch)
tree18109ce2cb54c37aa73235f6dae9e6efee014d39
parent6b08e42afd9ce4cd32863b533be38b62c46d6e6d (diff)
downloadgnome-keyring-16d41df3ad48b8d512afaf04937f19c9bdf0eafa.tar.gz
Don't crash on NULL parameter. Part of #339137
2007-02-12 Pascal Terjan <pterjan@linuxfr.org> * gnome-keyring-daemon.c: (gnome_keyring_free): Don't crash on NULL parameter. Part of #339137 svn path=/trunk/; revision=550
-rw-r--r--ChangeLog5
-rw-r--r--gnome-keyring-daemon.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 725a9d9f..ae4caded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-12 Pascal Terjan <pterjan@linuxfr.org>
+
+ * gnome-keyring-daemon.c: (gnome_keyring_free): Don't crash on NULL
+ parameter. Part of #339137
+
2007-02-12 Nate Nielsen <nielsen@memberwebs.com>
* configure.in: Bump version number
diff --git a/gnome-keyring-daemon.c b/gnome-keyring-daemon.c
index cd58976c..7c890199 100644
--- a/gnome-keyring-daemon.c
+++ b/gnome-keyring-daemon.c
@@ -94,6 +94,10 @@ gnome_keyring_free (GnomeKeyring *keyring)
GList *l;
GnomeKeyringItem *item;
+ if (keyring == NULL) {
+ return;
+ }
+
l = keyring->items;
while (l != NULL) {
item = l->data;