From: corsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Date: Wed, 8 Oct 2014 20:15:59 +0000 (+0000)
Subject: * debian/patches:
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/debian/lightdm.git/commitdiff_plain/4e10f9e0249f23c9ff21f92671c0bd7ef23f0cc9

* debian/patches:
  - 04_fix-double-free-configuration-key-source added, fix crash when
    key sources are defined twice in config files.            closes: #762211

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8640 0c9b3bff-18ee-0310-b944-d1aa2700132f
---

diff --git a/debian/changelog b/debian/changelog
index bd49e4c..fc58b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.10.2-3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 04_fix-double-free-configuration-key-source added, fix crash when
+      key sources are defined twice in config files.            closes: #762211
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 08 Oct 2014 22:09:00 +0200
+
 lightdm (1.10.2-2) unstable; urgency=medium
 
   * debian/patches:
diff --git a/debian/patches/04_fix-double-free-configuration-key-source.patch b/debian/patches/04_fix-double-free-configuration-key-source.patch
new file mode 100644
index 0000000..5d1251d
--- /dev/null
+++ b/debian/patches/04_fix-double-free-configuration-key-source.patch
@@ -0,0 +1,13 @@
+=== modified file 'common/configuration.c'
+--- lightdm/common/configuration.c	2014-09-07 23:28:20 +0000
++++ lightdm/common/configuration.c	2014-10-08 19:52:42 +0000
+@@ -311,7 +311,7 @@
+ {
+     config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, CONFIGURATION_TYPE, ConfigurationPrivate);
+     config->priv->key_file = g_key_file_new ();
+-    config->priv->key_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
++    config->priv->key_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ }
+ 
+ static void
+
diff --git a/debian/patches/series b/debian/patches/series
index f3822c3..f4fbea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_set-default-path.patch
 02_fix-apparmor-profile.patch
+04_fix-double-free-configuration-key-source.patch
 05_debianize-pam-files.patch