summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gdm-xdmcp-display-factory.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c8dfa06d..acce9936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-02-17 Brian Cameron <brian.cameron@sun.com>
+ * daemon/gdm-xdmcp-display-factory.c: Remove double free. Fixes bug
+ #565018. Patch by William Jan Palenstijn <wjp@usecode.org>.
+
+2009-02-17 Brian Cameron <brian.cameron@sun.com>
+
* utils/gdmflexiserver.c: Support VERSION command so that if user's
run gdmflexiser --command=VERSION, it will return the version number.
This is nice for backwards compatibility. Fixes bug #535450.
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 58cdf59c..aa68ae06 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -794,7 +794,6 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayFactory *factory,
s = get_willing_output (factory);
if (s != NULL) {
- g_free (last_status);
last_status = s;
} else {
last_status = g_strdup (factory->priv->sysid);