about summary refs log tree commit diff
path: root/debian/patches/12-initialize-gerror.patch
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-04-03 20:27:25 +0200
committerMichael Biebl <biebl@debian.org>2012-04-03 20:40:01 +0200
commit4eb5e555e5370cfc8aca3febb75770b6b8105c85 (patch)
treefeb8f70d50f87dcd9e4cb7de18e61001f9f9bf9d /debian/patches/12-initialize-gerror.patch
parentfe6e7636b433fda1b2e84cc2e998933242b37f8c (diff)
Initialize GError, else invalid free() crash can occur
debian/patches/12-initialize-gerror.patch: Initialize GError, else invalid
free() crash can occur. Fixes a crash in gnome-shell if NetworkManager is
not running. Patch cherry-picked from upstream Git. (Closes: #665791)
Thank a lot to Antti-Juhani Kaijanaho for tracking down this problem!
Diffstat (limited to 'debian/patches/12-initialize-gerror.patch')
-rw-r--r--debian/patches/12-initialize-gerror.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/12-initialize-gerror.patch b/debian/patches/12-initialize-gerror.patch
new file mode 100644
index 00000000..b619a65d
--- /dev/null
+++ b/debian/patches/12-initialize-gerror.patch
@@ -0,0 +1,20 @@
+commit 8bb278944496102a4afad46b53e1e8279425aaac
+Author: Jiří Klimeš <jklimes@redhat.com>
+Date:   Mon Apr 2 16:37:55 2012 +0200
+
+    libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123)
+
+diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
+index 9a81a8d..68aaeb4 100644
+--- a/libnm-glib/nm-remote-settings.c
++++ b/libnm-glib/nm-remote-settings.c
+@@ -109,7 +109,7 @@ static void
+ _nm_remote_settings_ensure_inited (NMRemoteSettings *self)
+ {
+ 	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
+-	GError *error;
++	GError *error = NULL;
+ 
+ 	if (!priv->inited) {
+ 		if (!g_initable_init (G_INITABLE (self), NULL, &error)) {
+12-initialize-gerror.patch