From 038b9f5fcfedd9c117fc69f164e5b1c04efb0aca Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Jun 2012 20:23:49 +0200 Subject: Update patches. * debian/patches/02-dbus_access_network_manager.patch: Updated. * Remove patches which have been merged upstream. --- debian/patches/12-initialize-gerror.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 debian/patches/12-initialize-gerror.patch (limited to 'debian/patches/12-initialize-gerror.patch') diff --git a/debian/patches/12-initialize-gerror.patch b/debian/patches/12-initialize-gerror.patch deleted file mode 100644 index b619a65d..00000000 --- a/debian/patches/12-initialize-gerror.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 8bb278944496102a4afad46b53e1e8279425aaac -Author: Jiří Klimeš -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 -- cgit 1.3.0-6-gf8a5