From 9b53438bce4b9b758895f68d5b77235a5e6e37d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Tue, 18 Sep 2018 15:35:20 +0200 Subject: Fix issue introduced in 20886264fe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes _gnutls_resolve_priorities() return a string that is always allocated with the gnutls memory functions. Signed-off-by: Tim Rühsen --- lib/priority.c | 6 +++--- tests/system-prio-file.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/priority.c b/lib/priority.c index 1991635d86..6a4ccc2f46 100644 --- a/lib/priority.c +++ b/lib/priority.c @@ -1056,7 +1056,7 @@ void _gnutls_unload_system_priorities(void) * priorities, appended with any additional present in * the priorities string. * - * The returned string must be released using free(). + * The returned string must be released using gnutls_free(). */ char *_gnutls_resolve_priorities(const char* priorities) { @@ -1140,7 +1140,7 @@ size_t n, n2 = 0, line_size; if (additional) n2 = strlen(additional); - ret = malloc(n+n2+1+1); + ret = gnutls_malloc(n+n2+1+1); if (ret == NULL) { goto finish; } @@ -1859,7 +1859,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, goto error_cleanup; } - free(darg); + gnutls_free(darg); return 0; diff --git a/tests/system-prio-file.c b/tests/system-prio-file.c index e0dfa9460c..4368bd0018 100644 --- a/tests/system-prio-file.c +++ b/tests/system-prio-file.c @@ -57,7 +57,7 @@ try_prio(const char *prio, const char *expected_str) } ok: - free(p); + gnutls_free(p); gnutls_global_deinit(); } @@ -84,4 +84,3 @@ void doit(void) try_prio("@HELLONO:+AES-128-CBC", NULL); try_prio("@HELLONO,:+AES-128-CBC", NULL); } - -- cgit v1.2.1