daandemeyer / rpms / systemd

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