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-06-29 20:23:49 +0200
committerMichael Biebl <biebl@debian.org>2012-06-29 20:23:49 +0200
commit038b9f5fcfedd9c117fc69f164e5b1c04efb0aca (patch)
tree7ae78f00ab213935e0228160c8eafd1d18409741 /debian/patches/12-initialize-gerror.patch
parent07c27d7af60c699c93e47e83582b5b0369049c54 (diff)
Update patches.
* debian/patches/02-dbus_access_network_manager.patch: Updated.
* Remove patches which have been merged upstream.
Diffstat (limited to 'debian/patches/12-initialize-gerror.patch')
-rw-r--r--debian/patches/12-initialize-gerror.patch20
1 files changed, 0 insertions, 20 deletions
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š <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