33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From 5852d2efbfb888dfb0adddb25afac0814d3ebcbb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Schmidt <mschmidt@redhat.com>
|
||
|
|
Date: Tue, 17 Feb 2015 10:36:57 +0100
|
||
|
|
Subject: [PATCH] journal-remote: fix client_cert memory leak
|
||
|
|
|
||
|
|
Found by Valgrind while testing the previous memory leak fix.
|
||
|
|
|
||
|
|
(cherry picked from commit 32c3d7144cf9a5c8c03761d7f198142ca0f5f7b8)
|
||
|
|
---
|
||
|
|
src/journal-remote/microhttpd-util.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
|
||
|
|
index de9c6ab32d..a95fff18f3 100644
|
||
|
|
--- a/src/journal-remote/microhttpd-util.c
|
||
|
|
+++ b/src/journal-remote/microhttpd-util.c
|
||
|
|
@@ -239,10 +239,14 @@ static int get_auth_dn(gnutls_x509_crt_t client_cert, char **buf) {
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static inline void gnutls_x509_crt_deinitp(gnutls_x509_crt_t *p) {
|
||
|
|
+ gnutls_x509_crt_deinit(*p);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int check_permissions(struct MHD_Connection *connection, int *code, char **hostname) {
|
||
|
|
const union MHD_ConnectionInfo *ci;
|
||
|
|
gnutls_session_t session;
|
||
|
|
- gnutls_x509_crt_t client_cert;
|
||
|
|
+ _cleanup_(gnutls_x509_crt_deinitp) gnutls_x509_crt_t client_cert = NULL;
|
||
|
|
_cleanup_free_ char *buf = NULL;
|
||
|
|
int r;
|
||
|
|
|