From: Guido Vranken <guidovranken@gmail.com>
Date: Thu, 8 Jun 2017 14:36:54 +0000 (+0200)
Subject: Fix 2 memory leaks in proxy authentication routine
X-Git-Tag: v2.3.17~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95927638f8ee5e14e7ac8845b20c5350cefc9b8;p=thirdparty%2Fopenvpn.git

Fix 2 memory leaks in proxy authentication routine

Signed-off-by: Guido Vranken <guidovranken@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <CAO5O-EL11jDxO+c1Gu0FvunqwUTW2uxjy910+A-s63Nr5O3NWw@mail.gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14758.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 8d606cd3f6bce304874b1d7745d40d11f64ea17d)
---

diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
index 0d0bd3c4c..1b3af0e67 100644
--- a/src/openvpn/proxy.c
+++ b/src/openvpn/proxy.c
@@ -289,6 +289,7 @@ get_proxy_authenticate (socket_descriptor_t sd,
     {
       if (!recv_line (sd, buf, sizeof (buf), timeout, true, NULL, signal_received))
 	{
+	  free(*data);
 	  *data = NULL;
 	  return HTTP_AUTH_NONE;
 	}
@@ -830,6 +831,7 @@ establish_http_proxy_passthru (struct http_proxy_info *p,
 	      if (p->options.auth_retry == PAR_NCT && method == HTTP_AUTH_BASIC)
 		{
 		  msg (D_PROXY, "HTTP proxy: support for basic auth and other cleartext proxy auth methods is disabled");
+		  free(pa);
 		  goto error;
 		}
 	      p->auth_method = method;