From: Steffan Karger <steffan@karger.me>
Date: Wed, 26 Sep 2018 19:27:06 +0000 (+0200)
Subject: Fix memory leak in SSL_CTX_use_certificate
X-Git-Tag: v2.5_beta1~437
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5544f47b0eb31e516aa8afbb68579e35e69cf7e7;p=thirdparty%2Fopenvpn.git

Fix memory leak in SSL_CTX_use_certificate

Commit 98bfeeb4 introduced a memory leak in SSL_CTX_use_certificate by
removing the "if(x509) { ... }" bit while not changing the
"else if(x) {}" right after to an "if(x) {}".

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20180926192706.29460-1-steffan@karger.me>
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index d9bc9d742..fe4db6047 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -855,7 +855,7 @@ end:
     {
         BIO_free(in);
     }
-    else if (x)
+    if (x)
     {
         X509_free(x);
     }