diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-11-01 22:12:41 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-11-01 22:12:41 +0200 |
| commit | 1e91aad491d104e563b815c857113b3b1d8fd9e7 (patch) | |
| tree | be9376b56325a205c11d87dd08a83b3f6f0f19e3 | |
| parent | 66ca0b4a059811df280ae849137e71bcad313e60 (diff) | |
glib-networking: Fix memory leak in last patch on Windows1.10.0
| -rw-r--r-- | recipes/glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/recipes/glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch b/recipes/glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch index 51fe63b8..5eb5d786 100644 --- a/recipes/glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch +++ b/recipes/glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch @@ -1,15 +1,15 @@ -From aad2b4a10fc1e21155724c6cc2bd735a589ad626 Mon Sep 17 00:00:00 2001 +From 6f3db1bb19c5f06dda25f13aa1e1a381233f3fd2 Mon Sep 17 00:00:00 2001 From: Sebastian Droege <sebastian@centricular.com> Date: Tue, 1 Nov 2016 19:48:12 +0000 Subject: [PATCH 4/4] gtlsbackend-gnutls: Get anchor file relative to libgio on Windows --- - tls/gnutls/gtlsbackend-gnutls.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + tls/gnutls/gtlsbackend-gnutls.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c -index 1cf9127..74c98af 100644 +index 1cf9127..8b281e5 100644 --- a/tls/gnutls/gtlsbackend-gnutls.c +++ b/tls/gnutls/gtlsbackend-gnutls.c @@ -38,6 +38,10 @@ @@ -23,7 +23,16 @@ index 1cf9127..74c98af 100644 struct _GTlsBackendGnutlsPrivate { GMutex mutex; -@@ -154,6 +158,22 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls *self, +@@ -124,7 +128,7 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls *self, + { + const gchar *anchor_file = NULL; + GTlsDatabase *db = NULL; +-#ifdef HAVE_DLADDR ++#if defined(HAVE_DLADDR) || defined(G_OS_WIN32) + gchar *free_me = NULL; + #endif + +@@ -154,12 +158,28 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls *self, } #endif @@ -37,7 +46,7 @@ index 1cf9127..74c98af 100644 + { + module_path = g_win32_get_package_installation_directory_of_module (module); + if (module_path) -+ anchor_file = g_build_filename (module_path, "etc", "ssl", "certs", "ca-certificates.crt", NULL); ++ anchor_file = free_me = g_build_filename (module_path, "etc", "ssl", "certs", "ca-certificates.crt", NULL); + g_free (module_path); + } + } @@ -46,6 +55,13 @@ index 1cf9127..74c98af 100644 #ifdef GST_CA_CERTIFICATES_FROM_ENV anchor_file = g_getenv ("CA_CERTIFICATES"); #endif + db = g_tls_file_database_new (anchor_file, error); + +-#ifdef HAVE_DLADDR ++#if defined(HAVE_DLADDR) || defined(G_OS_WIN32) + g_free (free_me); + #endif + return db; -- -2.6.3.windows.1 +2.10.2 |