summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Murino <nicola.murino@gmail.com>2015-09-24 12:47:48 +0200
committerSebastian Dröge <sebastian@centricular.com>2015-09-24 14:02:49 +0200
commit6298777a2d4d7fab33b60ee87274804b9ab31f4f (patch)
tree00ddee722aadd1d12cef39beedc11ffb755fdc88
parent77e017e30bcacab0dcfb01240b71f0adfc6c860c (diff)
glib-networking: fix memleak
https://bugzilla.gnome.org/show_bug.cgi?id=755530
-rw-r--r--recipes/glib-networking-static.recipe3
-rw-r--r--recipes/glib-networking.recipe3
-rw-r--r--recipes/glib-networking/0003-tlsconnection-fix-memleak.patch26
3 files changed, 30 insertions, 2 deletions
diff --git a/recipes/glib-networking-static.recipe b/recipes/glib-networking-static.recipe
index e2629206..53e80639 100644
--- a/recipes/glib-networking-static.recipe
+++ b/recipes/glib-networking-static.recipe
@@ -15,7 +15,8 @@ class Recipe(recipe.Recipe):
configure_options = "--without-ca-certificates --enable-static-modules --enable-static --enable-more-warnings"
deps = ['glib', 'gnutls', 'glib-networking']
patches = ['glib-networking/0001-Add-support-for-static-modules.patch',
- 'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch']
+ 'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch',
+ 'glib-networking/0003-tlsconnection-fix-memleak.patch']
files_devel = ['lib/gio/modules/static/libgiognutls.a',
'lib/gio/modules/static/libgiognutls.la']
diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe
index c5152cf6..a3acaf38 100644
--- a/recipes/glib-networking.recipe
+++ b/recipes/glib-networking.recipe
@@ -12,7 +12,8 @@ class Recipe(recipe.Recipe):
configure_options = "--without-ca-certificates --enable-more-warnings"
deps = ['glib', 'gnutls']
patches = ['glib-networking/0001-Add-support-for-static-modules.patch',
- 'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch']
+ 'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch',
+ 'glib-networking/0003-tlsconnection-fix-memleak.patch']
files_misc = ['lib/gio/modules/libgiognutls%(mext)s']
files_lang = ['glib-networking']
diff --git a/recipes/glib-networking/0003-tlsconnection-fix-memleak.patch b/recipes/glib-networking/0003-tlsconnection-fix-memleak.patch
new file mode 100644
index 00000000..d1559b46
--- /dev/null
+++ b/recipes/glib-networking/0003-tlsconnection-fix-memleak.patch
@@ -0,0 +1,26 @@
+From a6a0291ee977b16d8400b63e5b21f21a5332f799 Mon Sep 17 00:00:00 2001
+From: Nicola Murino <nicola.murino@gmail.com>
+Date: Thu, 24 Sep 2015 12:38:19 +0200
+Subject: [PATCH] tlsconnection: fix memleak
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755535
+
+---
+ tls/gnutls/gtlsconnection-gnutls.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
+index 4074266..749aa03 100644
+--- a/tls/gnutls/gtlsconnection-gnutls.c
++++ b/tls/gnutls/gtlsconnection-gnutls.c
+@@ -254,6 +254,7 @@ g_tls_connection_gnutls_init_priorities (void)
+ fallback_priority = g_strdup_printf ("%s:%%COMPAT:!VERS-TLS-ALL:+VERS-%s",
+ cleaned_base,
+ gnutls_protocol_get_name (fallback_proto));
++ g_free (cleaned_base);
+ }
+ fallback_unsafe_rehandshake_priority = g_strdup_printf ("%s:%%UNSAFE_RENEGOTIATION",
+ fallback_priority);
+--
+2.5.3
+