diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/12-initialize-gerror.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 150c2a38..88cf0a76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.9.4.0-3) UNRELEASED; urgency=low + + * 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! + + -- Michael Biebl <biebl@debian.org> Tue, 03 Apr 2012 20:12:19 +0200 + network-manager (0.9.4.0-2) unstable; urgency=low * debian/patches/11-initialize-nm-remote-settings.patch: Cherry-pick patch 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 diff --git a/debian/patches/series b/debian/patches/series index 90e8bae7..d9c8f38d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 03-systemd.patch 10-format-security.patch 11-initialize-nm-remote-settings.patch +12-initialize-gerror.patch |