* 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 bd49e4cc82b0ee6e2df0e82523dc7dabd428398a..fc58b8ece5c7e15400951980bae91632652fff5e 100644 (file)
--- 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 (file)
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 f3822c359033d5d6e0af885ef2e2479866688672..f4fbea2e18e19ece92168e47fa768af7e8c87ff7 100644 (file)
--- 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