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)
(cherry picked from commit a95927638f8ee5e14e7ac8845b20c5350cefc9b8)

diff --git a/proxy.c b/proxy.c
index da7f0db05d3376622d1d33edd4cd097d3cb8e950..0502ce99ff45c7eeb5e7c9eeb62700d9913739ad 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -273,6 +273,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;
        }
@@ -850,6 +851,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;